diff --git a/remove_generator.info b/remove_generator.info
deleted file mode 100644
index d56ffa3..0000000
--- a/remove_generator.info
+++ /dev/null
@@ -1,4 +0,0 @@
-name = Remove Generator
-description = Enable to remove the Generator META tag. No configuration required!
-core = 7.x
-files[] = remove_generator.test
diff --git a/remove_generator.module b/remove_generator.module
index 9db4aad..85cfa0d 100644
--- a/remove_generator.module
+++ b/remove_generator.module
@@ -1,29 +1,17 @@
 <?php
+
 /**
  * @file
  * Module file for Remove Generator.
  */
 
 /**
- * Implements hook_enable().
- */
-function remove_generator_enable() {
-  drupal_set_message(t('The Generator META tag has been removed.'));
-}
-
-/**
- * Implements hook_disable().
- */
-function remove_generator_disable() {
-  drupal_set_message(t('The Generator META tag has been restored.'));
-}
-
-/**
- * Implements hook_html_head_alter().
+ * Implements hook_page_attachments_alter().
  */
-function remove_generator_html_head_alter(&$head_elements) {
-  // Remove Generator META tag.
-  if (isset($head_elements['system_meta_generator'])) {
-    unset($head_elements['system_meta_generator']);
+function remove_generator_page_attachments_alter(array &$attachments) {
+  foreach ($attachments['#attached']['html_head'] as $key => $attachment) {
+    if ($attachment[1] == 'system_meta_generator') {
+      unset($attachments['#attached']['html_head'][1]);
+    }
   }
 }
