diff --git a/conf/zpush/backend_imap.php b/conf/zpush/backend_imap.php
index ecff7ada..877e7cd8 100644
--- a/conf/zpush/backend_imap.php
+++ b/conf/zpush/backend_imap.php
@@ -10,26 +10,16 @@ define('IMAP_PORT', 993);
 define('IMAP_OPTIONS', '/ssl/norsh/novalidate-cert');
 define('IMAP_DEFAULTFROM', '');
 
-// for new commit
 define('SYSTEM_MIME_TYPES_MAPPING', '/etc/mime.types');
 define('IMAP_AUTOSEEN_ON_DELETE', false);
-
 define('IMAP_FOLDER_CONFIGURED', true);
-// Folder prefix is the common part in your names (3, 4)
 define('IMAP_FOLDER_PREFIX', '');
-// Inbox will have the preffix preppend (3 & 4 to true)
 define('IMAP_FOLDER_PREFIX_IN_INBOX', false);
-// Inbox folder name (case doesn't matter) - (empty in 4)
 define('IMAP_FOLDER_INBOX', 'INBOX');
-// Sent folder name (case doesn't matter)
 define('IMAP_FOLDER_SENT', 'SENT');
-// Draft folder name (case doesn't matter)
 define('IMAP_FOLDER_DRAFT', 'DRAFTS');
-// Trash folder name (case doesn't matter)
 define('IMAP_FOLDER_TRASH', 'TRASH');
-// Spam folder name (case doesn't matter). Only showed as special by iOS devices
 define('IMAP_FOLDER_SPAM', 'SPAM');
-// Archive folder name (case doesn't matter). Only showed as special by iOS devices
 define('IMAP_FOLDER_ARCHIVE', 'ARCHIVE');
 
 
@@ -51,12 +41,6 @@ define('IMAP_FROM_LDAP_FIELDS', serialize(array('givenname', 'sn', 'mail')));
 define('IMAP_FROM_LDAP_FROM', '#givenname #sn <#mail>');
 
 
-// copy outgoing mail to this folder. If not set z-push will try the default folders
-// define('IMAP_SENTFOLDER', '');
-// define('IMAP_INLINE_FORWARD', true);
-// define('IMAP_EXCLUDED_FOLDERS', '');
-// define('IMAP_SMTP_METHOD', 'sendmail');
-
 global $imap_smtp_params;
 $imap_smtp_params = array('host' => 'ssl://localhost', 'port' => 587, 'auth' => true, 'username' => 'imap_username', 'password' => 'imap_password');