diff --git a/lib/Newsletter/Shortcodes/Categories/Date.php b/lib/Newsletter/Shortcodes/Categories/Date.php
index f066c1d510..dfa7ef9dda 100644
--- a/lib/Newsletter/Shortcodes/Categories/Date.php
+++ b/lib/Newsletter/Shortcodes/Categories/Date.php
@@ -2,32 +2,6 @@
 namespace MailPoet\Newsletter\Shortcodes\Categories;
 
 class Date {
-  /*
-    {
-      text: '<%= __('Current day of the month number') %>',
-      shortcode: 'date:d',
-    },
-    {
-      text: '<%= __('Current day of the month in ordinal, ie. 2nd, 3rd, etc.') %>',
-      shortcode: 'date:dordinal',
-    },
-    {
-      text: '<%= __('Full name of current day') %>',
-      shortcode: 'date:dtext',
-    },
-    {
-      text: '<%= __('Current month number') %>',
-      shortcode: 'date:m',
-    },
-    {
-      text: '<%= __('Full name of current month') %>',
-      shortcode: 'date:mtext',
-    },
-    {
-      text: '<%= __('Year') %>',
-      shortcode: 'date:y',
-    }
-   */
   static function process($action) {
     $date = new \DateTime('now');
     $actions = array(
diff --git a/lib/Newsletter/Shortcodes/Categories/Link.php b/lib/Newsletter/Shortcodes/Categories/Link.php
index a223e65d24..f22a425c4f 100644
--- a/lib/Newsletter/Shortcodes/Categories/Link.php
+++ b/lib/Newsletter/Shortcodes/Categories/Link.php
@@ -7,20 +7,6 @@ use MailPoet\Statistics\Track\Unsubscribes;
 use MailPoet\Subscription\Url as SubscriptionUrl;
 
 class Link {
-  /*
-    {
-      text: '<%= __('Unsubscribe') %>',-
-      shortcode: 'subscription:unsubscribe',
-    },
-    {
-      text: '<%= __('Manage subscription') %>',
-      shortcode: 'subscription:manage',
-    },
-    {
-      text: '<%= __('View in browser link') %>',
-      shortcode: 'newsletter:view_in_browser',
-    }
-   */
   static function process($action,
     $default_value = false,
     $newsletter,
diff --git a/lib/Newsletter/Shortcodes/Categories/Newsletter.php b/lib/Newsletter/Shortcodes/Categories/Newsletter.php
index 1aae2059c6..576369b777 100644
--- a/lib/Newsletter/Shortcodes/Categories/Newsletter.php
+++ b/lib/Newsletter/Shortcodes/Categories/Newsletter.php
@@ -7,28 +7,6 @@ use MailPoet\Newsletter\Shortcodes\ShortcodesHelper;
 require_once( ABSPATH . "wp-includes/pluggable.php" );
 
 class Newsletter {
-  /*
-    {
-      text: '<%= __('Newsletter Subject') %>',-
-      shortcode: 'newsletter:subject',
-    },
-    {
-      text: '<%= __('Total number of posts or pages') %>',
-      shortcode: 'newsletter:total',
-    },
-    {
-      text: '<%= __('Latest post title') %>',
-      shortcode: 'newsletter:post_title',
-    },
-    {
-      text: '<%= __('Issue number') %>',
-      shortcode: 'newsletter:number',
-    },
-    {
-      text: '<%= __('Issue number') %>',
-      shortcode: 'newsletter:number',
-    }
-   */
   static function process($action,
     $default_value = false,
     $newsletter,
diff --git a/lib/Newsletter/Shortcodes/Categories/Subscriber.php b/lib/Newsletter/Shortcodes/Categories/Subscriber.php
index bcbe28e61d..dbbef54ebf 100644
--- a/lib/Newsletter/Shortcodes/Categories/Subscriber.php
+++ b/lib/Newsletter/Shortcodes/Categories/Subscriber.php
@@ -1,33 +1,11 @@
 <?php
 namespace MailPoet\Newsletter\Shortcodes\Categories;
 
-use MailPoet\Models\Subscriber;
+use MailPoet\Models\SubscriberCustomField;
 
 require_once(ABSPATH . 'wp-includes/pluggable.php');
 
-class User {
-  /*
-    {
-      text: '<%= __('First Name') %>',
-      shortcode: 'user:firstname | default:reader',
-    },
-    {
-      text: '<%= __('Last Name') %>',
-      shortcode: 'user:lastname | default:reader',
-    },
-    {
-      text: '<%= __('Email Address') %>',
-      shortcode: 'user:email',
-    },
-    {
-      text: '<%= __('Wordpress user display name') %>',
-      shortcode: 'user:displayname | default:member',
-    },
-    {
-      text: '<%= __('Total of subscribers') %>',
-      shortcode: 'user:count',
-    }
-   */
+class Subscriber {
   static function process(
     $action,
     $default_value,
@@ -38,15 +16,12 @@ class User {
       case 'firstname':
         return ($subscriber) ? $subscriber['first_name'] : $default_value;
       break;
-
       case 'lastname':
         return ($subscriber) ? $subscriber['last_name'] : $default_value;
       break;
-
       case 'email':
         return ($subscriber) ? $subscriber['email'] : false;
       break;
-
       case 'displayname':
         if($subscriber && $subscriber['wp_user_id']) {
           $wp_user = get_userdata($subscriber['wp_user_id']);
@@ -54,11 +29,17 @@ class User {
         }
         return $default_value;
       break;
-
       case 'count':
         return Subscriber::filter('subscribed')->count();
       break;
-
+      case preg_match('/cf_(\d+)/', $action, $custom_field) ? true : false:
+        if(empty($subscriber['id'])) return false;
+        $custom_field = SubscriberCustomField
+          ::where('subscriber_id', $subscriber['id'])
+          ->where('custom_field_id', $custom_field[1])
+          ->findOne();
+        return ($custom_field) ? $custom_field->value : false;
+      break;
       default:
         return false;
       break;