diff --git a/user_external_invite.admin.inc b/user_external_invite.admin.inc
index 6e7783c..a0b0bb2 100644
--- a/user_external_invite.admin.inc
+++ b/user_external_invite.admin.inc
@@ -136,7 +136,6 @@ function user_external_invite_settings_form() {
     '#description' => t('Message sent to invitee confirming the process was completed.'),
   );
 
-  // @TODO: add warning email about expiring invitations.
   $form['token_help']['content'] = array(
     '#type' => 'markup',
     '#token_types' => 'all',
diff --git a/user_external_invite.module b/user_external_invite.module
index 69d376c..f2e533a 100644
--- a/user_external_invite.module
+++ b/user_external_invite.module
@@ -207,7 +207,6 @@ function user_external_invite_pending_invites_form($form, &$form_state) {
     $operation = $form_state['values']['select'];
 
     // Count the number of invites for user message.
-    // @todo It would be nice to do this in a more concise way.
     $num_invites = 0;
     foreach ($form_state['input']['table'] as $value) {
       if ($value != NULL) {
@@ -269,7 +268,6 @@ function user_external_invite_pending_invites_form_submit(&$form, &$form_state)
         user_external_invite_resend_invites($ids, $message);
 
         // Set message to user about successful resent invites.
-        // @todo Handle this better for possible errors. We're assuming invites were sent.
         $num_invites = count($ids);
         $plural_invites = $num_invites > 1 ? 'invites' : 'invite';
         drupal_set_message(t('Successfully resent :number user :invites.', array(
@@ -415,7 +413,6 @@ function _user_external_invite_add_invite($rid, $emails, $uid, $message = NULL,
     'site_name' => $site_name,
   );
 
-  // @TODO: use universal email?
   drupal_mail('user_external_invite', 'user_external_invite_sent', $user->mail, language_default(), $params, $from, TRUE);
 }
 
@@ -753,7 +750,6 @@ function _user_external_invite_dehash($key, $mail) {
     ->fetchAssoc();
   if ($result['expire'] < REQUEST_TIME) {
     // Token has expired.
-    // @todo: need a better error here.
     return FALSE;
   }
   $expected_hash = _user_external_invite_calculate_hash($result['rid'], $result['mail'], $result['expire']);
