diff --git a/masquerade.install b/masquerade.install
index a10d092..8075f3b 100644
--- a/masquerade.install
+++ b/masquerade.install
@@ -2,15 +2,11 @@
 
 /**
  * @file
- * masquerade.install
- *
  * Install, uninstall and update hooks for the Masquarade module.
  */
 
 /**
  * Implements hook_schema().
- *
- * @return array
  */
 function masquerade_schema() {
   return array(
diff --git a/masquerade.module b/masquerade.module
index 56a0d78..0e48ede 100644
--- a/masquerade.module
+++ b/masquerade.module
@@ -19,8 +19,6 @@ function masquerade_help($path, $arg) {
 
 /**
  * Implements hook_permission().
- *
- * @return array
  */
 function masquerade_permission() {
   return array(
@@ -84,8 +82,6 @@ function masquerade_cron() {
  * Implements hook_menu().
  */
 function masquerade_menu() {
-  $items = array();
-
   $default_test_user = _masquerade_user_load(variable_get('masquerade_test_user', ''));
   if ($default_test_user && ($default_test_user->uid || $default_test_user->name == variable_get('anonymous', t('Anonymous')))) {
     $items['masquerade/switch/' . $default_test_user->uid] = array(
@@ -95,7 +91,6 @@ function masquerade_menu() {
       'page arguments' => array(2),
       'access callback' => 'masquerade_menu_access',
       'access arguments' => array('switch'),
-      'type' => MENU_NORMAL_ITEM,
     );
   }
 
@@ -105,14 +100,12 @@ function masquerade_menu() {
     'page arguments' => array(2),
     'access callback' => 'masquerade_menu_access',
     'access arguments' => array('switch', 2),
-    'type' => MENU_NORMAL_ITEM,
   );
   $items['masquerade/unswitch'] = array(
     'title' => 'Switch back',
     'page callback' => 'masquerade_switch_back_page',
     'access callback' => 'masquerade_menu_access',
     'access arguments' => array('unswitch'),
-    'type' => MENU_NORMAL_ITEM,
   );
   $items['masquerade/autocomplete'] = array(
     'title' => '',
@@ -142,7 +135,6 @@ function masquerade_menu() {
     'page arguments' => array('masquerade_admin_settings'),
     'access callback' => 'user_access',
     'access arguments' => array('administer masquerade'),
-    'type' => MENU_NORMAL_ITEM,
   );
 
   return $items;
@@ -222,13 +214,14 @@ function masquerade_menu_access($type, $uid = NULL) {
   switch ($type) {
     case 'unswitch':
       return isset($_SESSION['masquerading']) || arg(2) == 'menu-customize' || arg(2) == 'menu';
+
     case 'autocomplete':
       return isset($_SESSION['masquerading']) || (user_access('masquerade as user') || user_access('masquerade as admin'));
-      break;
+
     case 'user':
       global $user;
       return db_query("SELECT 1 FROM {masquerade_users} WHERE uid_from = :uid_from", array(':uid_from' => $user->uid))->fetchField();
-      break;
+
     case 'switch':
       $switch_to_account = FALSE;
       global $user;
@@ -244,7 +237,6 @@ function masquerade_menu_access($type, $uid = NULL) {
         }
       }
       return !isset($_SESSION['masquerading']) && (user_access('masquerade as user') || user_access('masquerade as admin') || $switch_to_account);
-      break;
   }
 }
 
@@ -252,8 +244,7 @@ function masquerade_menu_access($type, $uid = NULL) {
  * Admin settings form.
  */
 function masquerade_admin_settings() {
-  drupal_set_message(user_access('masquerade as user') ? 'Allowed' : 'Disallowed');
-  // create a list of roles; all selected roles are considered administrative.
+  // Create a list of roles; all selected roles are considered administrative.
   $roles = user_roles();
   $form['masquerade_admin_roles'] = array(
     '#type' => 'checkboxes',
@@ -360,8 +351,6 @@ function _masquerade_user_load($username) {
 function masquerade_user_logout($account) {
   if (!empty($account->masquerading)) {
     global $user;
-    // @TODO Seems this useless.
-    cache_clear_all($user->uid, 'cache_menu', TRUE);
     $real_user = user_load($user->masquerading);
     watchdog('masquerade', "User %user no longer masquerading as %masq_as.", array('%user' => $real_user->name, '%masq_as' => $user->name), WATCHDOG_INFO);
 
@@ -847,8 +836,6 @@ function masquerade_switch_back_page() {
 function masquerade_switch_back() {
   // Switch user.
   global $user;
-  // @TODO Seems useless.
-  cache_clear_all($user->uid, 'cache_menu', TRUE);
   $uid = db_query("SELECT m.uid_from FROM {masquerade} m WHERE m.sid = :sid AND m.uid_as = :uid_as ", array(
     ':sid' => session_id(),
     ':uid_as' => $user->uid,
diff --git a/masquerade.test b/masquerade.test
index c1a6fa8..699884b 100644
--- a/masquerade.test
+++ b/masquerade.test
@@ -2,8 +2,6 @@
 
 /**
  * @file
- * masquerade.test
- *
  * Test the form permissions and switch ability of the Masquarade module.
  */