diff --git a/admin_customers.php b/admin_customers.php
index b3322be2..f3e2bfb2 100644
--- a/admin_customers.php
+++ b/admin_customers.php
@@ -47,10 +47,6 @@ if ($page == 'customers'
 			'c.traffic_used' => $lng['customer']['traffic'] . ' (' . $lng['panel']['used'] . ')'
 		);
 
-		if ($settings['system']['backup_enabled'] == '1') {
-			$field['c.backup_allowed'] = $lng['backup_allowed'];
-		}
-
 		$paging = new paging($userinfo, TABLE_PANEL_CUSTOMERS, $fields, $settings['panel']['paging'], $settings['panel']['natsorting']);
 		$customers = '';
 		$result_stmt = Database::prepare("
@@ -120,7 +116,7 @@ if ($page == 'customers'
 					$islocked = 1;
 				}
 
-				$row = str_replace_array('-1', 'UL', $row, 'diskspace traffic mysqls emails email_accounts email_forwarders ftps tickets subdomains email_autoresponder');
+				$row = str_replace_array('-1', 'UL', $row, 'diskspace traffic mysqls emails email_accounts email_forwarders ftps tickets subdomains');
 				$row = htmlentities_array($row);
 				eval("\$customers.=\"" . getTemplate("customers/customers_customer") . "\";");
 				$count++;
@@ -307,8 +303,6 @@ if ($page == 'customers'
 				Database::pexecute($stmt, array('id' => $id));
 				$stmt = Database::prepare("DELETE FROM `" . TABLE_FTP_USERS . "` WHERE `customerid` = :id");
 				Database::pexecute($stmt, array('id' => $id));
-				$stmt = Database::prepare("DELETE FROM `" . TABLE_MAIL_AUTORESPONDER . "` WHERE `customerid` = :id");
-				Database::pexecute($stmt, array('id' => $id));
 
 				// Delete all waiting "create user" -tasks for this user, #276
 				// Note: the WHERE selects part of a serialized array, but it should be safe this way
@@ -318,26 +312,6 @@ if ($page == 'customers'
 				);
 				Database::pexecute($del_stmt, array(':loginname' => "%:{$result['loginname']};%"));
 
-				// remove everything APS-related, #216
-				$apsresult_stmt = Database::prepare("SELECT `ID` FROM `".TABLE_APS_INSTANCES."` WHERE `CustomerID` = :id");
-				Database::pexecute($apsresult_stmt, array('id' => $id));
-
-				while ($apsrow = $apsresult_stmt->fetch(PDO::FETCH_ASSOC)) {
-					// remove all package related settings
-					$del_stmt = Database::prepare("DELETE FROM `".TABLE_APS_SETTINGS."` WHERE `InstanceID` = :iid");
-					Database::pexecute($del_stmt, array('iid' => $apsrow['ID']));
-					// maybe some leftovers in the tasks
-					$del_stmt = Database::prepare("DELETE FROM `".TABLE_APS_TASKS."` WHERE `InstanceID` = :iid");
-					Database::pexecute($del_stmt, array('iid' => $apsrow['ID']));
-				}
-				// now remove all user instances
-				$stmt = Database::prepare("DELETE FROM `".TABLE_APS_INSTANCES."` WHERE `CustomerID` = :id'");
-				Database::pexecute($stmt, array('id' => $id));
-				// eventually some temp-setting-leftovers
-				$stmt = Database::prepare("DELETE FROM `".TABLE_APS_TEMP_SETTINGS."` WHERE `CustomerID` = :id");
-				Database::pexecute($stmt, array('id' => $id));
-				// eof APS-related removings, #216
-
 				$admin_update_query = "UPDATE `" . TABLE_PANEL_ADMINS . "` SET `customers_used` = `customers_used` - 1 ";
 				$admin_update_query.= ", `domains_used` = `domains_used` - 0" . (int)($domains_deleted - $result['subdomains_used']);
 
@@ -361,10 +335,6 @@ if ($page == 'customers'
 					$admin_update_query.= ", `email_quota_used` = `email_quota_used` - 0" . (int)$result['email_quota'];
 				}
 
-				if ($result['email_autoresponder'] != '-1') {
-					$admin_update_query.= ", `email_autoresponder_used` = `email_autoresponder_used` - 0" . (int)$result['email_autoresponder'];
-				}
-
 				if ($result['subdomains'] != '-1') {
 					$admin_update_query.= ", `subdomains_used` = `subdomains_used` - 0" . (int)$result['subdomains'];
 				}
@@ -377,10 +347,6 @@ if ($page == 'customers'
 					$admin_update_query.= ", `tickets_used` = `tickets_used` - 0" . (int)$result['tickets'];
 				}
 
-				if ($result['aps_packages'] != '-1') {
-					$admin_update_query.= ", `aps_packages_used` = `aps_packages_used` - 0" . (int)$result['aps_packages'];
-				}
-
 				if (($result['diskspace'] / 1024) != '-1') {
 					$admin_update_query.= ", `diskspace_used` = `diskspace_used` - 0" . (int)$result['diskspace'];
 				}
@@ -485,15 +451,6 @@ if ($page == 'customers'
 					$email_quota = - 1;
 				}
 
-				if ($settings['autoresponder']['autoresponder_active'] == '1') {
-					$email_autoresponder = intval_ressource($_POST['email_autoresponder']);
-					if (isset($_POST['email_autoresponder_ul'])) {
-						$email_autoresponder = - 1;
-					}
-				} else {
-					$email_autoresponder = 0;
-				}
-
 				$email_imap = 0;
 				if (isset($_POST['email_imap'])) {
 					$email_imap = intval_ressource($_POST['email_imap']);
@@ -524,15 +481,6 @@ if ($page == 'customers'
 					$mysqls = - 1;
 				}
 
-				if ($settings['aps']['aps_active'] == '1') {
-					$number_of_aps_packages = intval_ressource($_POST['number_of_aps_packages']);
-					if (isset($_POST['number_of_aps_packages_ul'])) {
-						$number_of_aps_packages = - 1;
-					}
-				} else {
-					$number_of_aps_packages = 0;
-				}
-
 				$createstdsubdomain = 0;
 				if(isset($_POST['createstdsubdomain'])) {
 					$createstdsubdomain = intval($_POST['createstdsubdomain']);
@@ -545,15 +493,6 @@ if ($page == 'customers'
 					$password = validatePassword($password);
 				}
 
-				$backup_allowed = 0;
-				if (isset($_POST['backup_allowed'])) {
-					$backup_allowed = intval($_POST['backup_allowed']);
-				}
-
-				if ($backup_allowed != 0) {
-					$backup_allowed = 1;
-				}
-
 				// gender out of range? [0,2]
 				if ($gender < 0 || $gender > 2) {
 					$gender = 0;
@@ -588,22 +527,18 @@ if ($page == 'customers'
 				   || ((($userinfo['email_accounts_used'] + $email_accounts) > $userinfo['email_accounts']) && $userinfo['email_accounts'] != '-1')
 				   || ((($userinfo['email_forwarders_used'] + $email_forwarders) > $userinfo['email_forwarders']) && $userinfo['email_forwarders'] != '-1')
 				   || ((($userinfo['email_quota_used'] + $email_quota) > $userinfo['email_quota']) && $userinfo['email_quota'] != '-1' && $settings['system']['mail_quota_enabled'] == '1')
-				   || ((($userinfo['email_autoresponder_used'] + $email_autoresponder) > $userinfo['email_autoresponder']) && $userinfo['email_autoresponder'] != '-1' && $settings['autoresponder']['autoresponder_active'] == '1')
 				   || ((($userinfo['ftps_used'] + $ftps) > $userinfo['ftps']) && $userinfo['ftps'] != '-1')
 				   || ((($userinfo['tickets_used'] + $tickets) > $userinfo['tickets']) && $userinfo['tickets'] != '-1')
 				   || ((($userinfo['subdomains_used'] + $subdomains) > $userinfo['subdomains']) && $userinfo['subdomains'] != '-1')
-				   || ((($userinfo['aps_packages_used'] + $number_of_aps_packages) > $userinfo['aps_packages']) && $userinfo['aps_packages'] != '-1' && $settings['aps']['aps_active'] == '1')
 				   || (($diskspace / 1024) == '-1' && ($userinfo['diskspace'] / 1024) != '-1')
 				   || ($mysqls == '-1' && $userinfo['mysqls'] != '-1')
 				   || ($emails == '-1' && $userinfo['emails'] != '-1')
 				   || ($email_accounts == '-1' && $userinfo['email_accounts'] != '-1')
 				   || ($email_forwarders == '-1' && $userinfo['email_forwarders'] != '-1')
 				   || ($email_quota == '-1' && $userinfo['email_quota'] != '-1' && $settings['system']['mail_quota_enabled'] == '1')
-				   || ($email_autoresponder == '-1' && $userinfo['email_autoresponder'] != '-1' && $settings['autoresponder']['autoresponder_active'] == '1')
 				   || ($ftps == '-1' && $userinfo['ftps'] != '-1')
 				   || ($tickets == '-1' && $userinfo['tickets'] != '-1')
 				   || ($subdomains == '-1' && $userinfo['subdomains'] != '-1')
-				   || ($number_of_aps_packages == '-1' && $userinfo['aps_packages'] != '-1')
 				) {
 					standard_error('youcantallocatemorethanyouhave');
 					exit;
@@ -728,10 +663,7 @@ if ($page == 'customers'
 						'phpenabled' => $phpenabled,
 						'imap' => $email_imap,
 						'pop3' => $email_pop3,
-						'aps' => $number_of_aps_packages,
 						'perlenabled' => $perlenabled,
-						'email_autoresponder' => $email_autoresponder,
-						'backup_allowed' => $backup_allowed,
 						'theme' => $theme
 					);
 
@@ -768,10 +700,7 @@ if ($page == 'customers'
 						`phpenabled` = :phpenabled,
 						`imap` = :imap,
 						`pop3` = :pop3,
-						`aps_packages` = :aps,
 						`perlenabled` = :perlenabled,
-						`email_autoresponder` = :email_autoresponder,
-						`backup_allowed` = :backup_allowed,
 						`theme` = :theme"
 					);
 					Database::pexecute($ins_stmt, $ins_data);
@@ -800,12 +729,6 @@ if ($page == 'customers'
 						$admin_update_query.= ", `email_quota_used` = `email_quota_used` + 0" . (int)$email_quota;
 					}
 
-					if ($email_autoresponder != '-1'
-						&& $settings['autoresponder']['autoresponder_active'] == 1
-					) {
-						$admin_update_query.= ", `email_autoresponder_used` = `email_autoresponder_used` + 0" . (int)$email_autoresponder;
-					}
-
 					if ($subdomains != '-1') {
 						$admin_update_query.= ", `subdomains_used` = `subdomains_used` + 0" . (int)$subdomains;
 					}
@@ -824,10 +747,6 @@ if ($page == 'customers'
 						$admin_update_query.= ", `diskspace_used` = `diskspace_used` + 0" . (int)$diskspace;
 					}
 
-					if ($number_of_aps_packages != '-1') {
-						$admin_update_query.= ", `aps_packages_used` = `aps_packages_used` + 0" . (int)$number_of_aps_packages;
-					}
-
 					$admin_update_query.= " WHERE `adminid` = '" . (int)$userinfo['adminid'] . "'";
 					Database::query($admin_update_query);
 
@@ -1032,11 +951,9 @@ if ($page == 'customers'
 				$email_accounts_ul = makecheckbox('email_accounts_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true);
 				$email_forwarders_ul = makecheckbox('email_forwarders_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true);
 				$email_quota_ul = makecheckbox('email_quota_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true);
-				$email_autoresponder_ul = makecheckbox('email_autoresponder_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true);
 				$ftps_ul = makecheckbox('ftps_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true);
 				$tickets_ul = makecheckbox('tickets_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true);
 				$mysqls_ul = makecheckbox('mysqls_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true);
-				$number_of_aps_packages_ul = makecheckbox('number_of_aps_packages_ul', $lng['customer']['unlimited'], '-1', false, '0', true, true);
 
 				$gender_options = makeoption($lng['gender']['undef'], 0, true, true, true);
 				$gender_options .= makeoption($lng['gender']['male'], 1, null, true, true);
@@ -1125,15 +1042,6 @@ if ($page == 'customers'
 					$email_quota = - 1;
 				}
 
-				if ($settings['autoresponder']['autoresponder_active'] == '1') {
-					$email_autoresponder = intval_ressource($_POST['email_autoresponder']);
-					if (isset($_POST['email_autoresponder_ul'])) {
-						$email_autoresponder = - 1;
-					}
-				} else {
-					$email_autoresponder = 0;
-				}
-
 				$email_imap = 0;
 				if (isset($_POST['email_imap'])) {
 					$email_imap = intval_ressource($_POST['email_imap']);
@@ -1159,14 +1067,6 @@ if ($page == 'customers'
 					$tickets = - 1;
 				}
 
-				$backup_allowed = 0;
-				if (isset($_POST['backup_allowed'])) {
-					$backup_allowed = intval($_POST['backup_allowed']);
-				}
-				if ($backup_allowed != '0') {
-					$backup_allowed = 1;
-				}
-
 				// gender out of range? [0,2]
 				if ($gender < 0 || $gender > 2) {
 					$gender = 0;
@@ -1180,15 +1080,6 @@ if ($page == 'customers'
 					$mysqls = - 1;
 				}
 
-				if ($settings['aps']['aps_active'] == '1') {
-					$number_of_aps_packages = intval_ressource($_POST['number_of_aps_packages']);
-					if (isset($_POST['number_of_aps_packages_ul'])) {
-						$number_of_aps_packages = - 1;
-					}
-				} else {
-					$number_of_aps_packages = 0;
-				}
-
 				$createstdsubdomain = 0;
 				if (isset($_POST['createstdsubdomain'])) {
 					$createstdsubdomain = intval($_POST['createstdsubdomain']);
@@ -1218,22 +1109,18 @@ if ($page == 'customers'
 				   || ((($userinfo['email_accounts_used'] + $email_accounts - $result['email_accounts']) > $userinfo['email_accounts']) && $userinfo['email_accounts'] != '-1')
 				   || ((($userinfo['email_forwarders_used'] + $email_forwarders - $result['email_forwarders']) > $userinfo['email_forwarders']) && $userinfo['email_forwarders'] != '-1')
 				   || ((($userinfo['email_quota_used'] + $email_quota - $result['email_quota']) > $userinfo['email_quota']) && $userinfo['email_quota'] != '-1' && $settings['system']['mail_quota_enabled'] == '1')
-				   || ((($userinfo['email_autoresponder_used'] + $email_autoresponder - $result['email_autoresponder']) > $userinfo['email_autoresponder']) && $userinfo['email_autoresponder'] != '-1' && $settings['autoresponder']['autoresponder_active'] == '1')
 				   || ((($userinfo['ftps_used'] + $ftps - $result['ftps']) > $userinfo['ftps']) && $userinfo['ftps'] != '-1')
 				   || ((($userinfo['tickets_used'] + $tickets - $result['tickets']) > $userinfo['tickets']) && $userinfo['tickets'] != '-1')
 				   || ((($userinfo['subdomains_used'] + $subdomains - $result['subdomains']) > $userinfo['subdomains']) && $userinfo['subdomains'] != '-1')
 				   || (($diskspace / 1024) == '-1' && ($userinfo['diskspace'] / 1024) != '-1')
-				   || ((($userinfo['aps_packages'] + $number_of_aps_packages - $result['aps_packages']) > $userinfo['aps_packages']) && $userinfo['aps_packages'] != '-1' && $settings['aps']['aps_active'] == '1')
 				   || ($mysqls == '-1' && $userinfo['mysqls'] != '-1')
 				   || ($emails == '-1' && $userinfo['emails'] != '-1')
 				   || ($email_accounts == '-1' && $userinfo['email_accounts'] != '-1')
 				   || ($email_forwarders == '-1' && $userinfo['email_forwarders'] != '-1')
 				   || ($email_quota == '-1' && $userinfo['email_quota'] != '-1' && $settings['system']['mail_quota_enabled'] == '1')
-				   || ($email_autoresponder == '-1' && $userinfo['email_autoresponder'] != '-1' && $settings['autoresponder']['autoresponder_active'] == '1')
 				   || ($ftps == '-1' && $userinfo['ftps'] != '-1')
 				   || ($tickets == '-1' && $userinfo['tickets'] != '-1')
 				   || ($subdomains == '-1' && $userinfo['subdomains'] != '-1')
-				   || ($number_of_aps_packages == '-1' && $userinfo['aps_packages'] != '-1')
 				) {
 					standard_error('youcantallocatemorethanyouhave');
 					exit;
@@ -1451,10 +1338,7 @@ if ($page == 'customers'
 						'phpenabled' => $phpenabled,
 						'imap' => $email_imap,
 						'pop3' => $email_pop3,
-						'aps' => $number_of_aps_packages,
-						'perlenabled' => $perlenabled,
-						'email_autoresponder' => $email_autoresponder,
-						'backup_allowed' => $backup_allowed
+						'perlenabled' => $perlenabled
 					);
 					$upd_stmt = Database::prepare("
 						UPDATE `" . TABLE_PANEL_CUSTOMERS . "` SET
@@ -1485,10 +1369,7 @@ if ($page == 'customers'
 						`email_quota` = :email_quota,
 						`imap` = :imap,
 						`pop3` = :pop3,
-						`aps_packages` = :aps,
-						`perlenabled` = :perlenabled,
-						`email_autoresponder` = :email_autoresponder,
-						`backup_allowed` = :backup_allowed
+						`perlenabled` = :perlenabled
 						WHERE `customerid` = :customerid"
 					);
 					Database::pexecute($upd_stmt, $upd_data);
@@ -1553,17 +1434,6 @@ if ($page == 'customers'
 						}
 					}
 
-					if ($email_autoresponder != '-1' || $result['email_autoresponder'] != '-1') {
-						$admin_update_query.= ", `email_autoresponder_used` = `email_autoresponder_used` ";
-
-						if ($email_autoresponder != '-1') {
-							$admin_update_query.= " + 0" . (int)$email_autoresponder . " ";
-						}
-						if ($result['email_autoresponder'] != '-1') {
-							$admin_update_query.= " - 0" . (int)$result['email_autoresponder'] . " ";
-						}
-					}
-
 					if ($subdomains != '-1' || $result['subdomains'] != '-1') {
 						$admin_update_query.= ", `subdomains_used` = `subdomains_used` ";
 
@@ -1608,17 +1478,6 @@ if ($page == 'customers'
 						}
 					}
 
-					if ($number_of_aps_packages != '-1' || $result['aps_packages'] != '-1') {
-						$admin_update_query.= ", `aps_packages_used` = `aps_packages_used` ";
-
-						if ($number_of_aps_packages != '-1') {
-							$admin_update_query.= " + 0" . (int)$number_of_aps_packages . " ";
-						}
-						if ($result['aps_packages'] != '-1') {
-							$admin_update_query.= " - 0" . (int)$result['aps_packages'] . " ";
-						}
-					}
-
 					$admin_update_query.= " WHERE `adminid` = '" . (int)$result['adminid'] . "'";
 					Database::query($admin_update_query);
 					$log->logAction(ADM_ACTION, LOG_INFO, "edited user '" . $result['loginname'] . "'");
@@ -1676,11 +1535,6 @@ if ($page == 'customers'
 					$result['email_quota'] = '';
 				}
 
-				$email_autoresponder_ul = makecheckbox('email_autoresponder_ul', $lng['customer']['unlimited'], '-1', false, $result['email_autoresponder'], true, true);
-				if ($result['email_autoresponder'] == '-1') {
-					$result['email_autoresponder'] = '';
-				}
-
 				$ftps_ul = makecheckbox('ftps_ul', $lng['customer']['unlimited'], '-1', false, $result['ftps'], true, true);
 				if ($result['ftps'] == '-1') {
 					$result['ftps'] = '';
@@ -1696,11 +1550,6 @@ if ($page == 'customers'
 					$result['mysqls'] = '';
 				}
 
-				$number_of_aps_packages_ul = makecheckbox('number_of_aps_packages_ul', $lng['customer']['unlimited'], '-1', false, $result['aps_packages'], true, true);
-				if ($result['aps_packages'] == '-1') {
-					$result['aps_packages'] = '';
-				}
-
 				$result = htmlentities_array($result);
 
 				$gender_options = makeoption($lng['gender']['undef'], 0, ($result['gender'] == '0' ? true : false), true, true);
diff --git a/admin_domains.php b/admin_domains.php
index ab1a0432..9b95021b 100644
--- a/admin_domains.php
+++ b/admin_domains.php
@@ -179,11 +179,6 @@ if ($page == 'domains'
 			if (isset($_POST['send'])
 				&& $_POST['send'] == 'send'
 			) {
-				//check for APS packages used with this domain, #110
-				if (domainHasApsInstances($id)) {
-					standard_error('domains_cantdeletedomainwithapsinstances');
-				}
-
 				// check for deletion of main-domains which are logically subdomains, #329
 				$rsd_sql = '';
 				$remove_subbutmain_domains = isset($_POST['delete_userfiles']) ? 1 : 0;
diff --git a/admin_index.php b/admin_index.php
index 668edf90..80ad56c7 100644
--- a/admin_index.php
+++ b/admin_index.php
@@ -60,12 +60,10 @@ if ($page == 'overview') {
 				SUM(`email_accounts_used`) AS `email_accounts_used`,
 				SUM(`email_forwarders_used`) AS `email_forwarders_used`,
 				SUM(`email_quota_used`) AS `email_quota_used`,
-				SUM(`email_autoresponder_used`) AS `email_autoresponder_used`,
 				SUM(`ftps_used`) AS `ftps_used`,
 				SUM(`tickets_used`) AS `tickets_used`,
 				SUM(`subdomains_used`) AS `subdomains_used`,
-				SUM(`traffic_used`) AS `traffic_used`,
-				SUM(`aps_packages_used`) AS `aps_packages_used`
+				SUM(`traffic_used`) AS `traffic_used`
 				FROM `" . TABLE_PANEL_CUSTOMERS . "`" . ($userinfo['customers_see_all'] ? '' : " WHERE `adminid` = :adminid "));
 	$overview = Database::pexecute_first($overview_stmt, array('adminid' => $userinfo['adminid']));
 
@@ -133,7 +131,7 @@ if ($page == 'overview') {
 	$userinfo['diskspace_used'] = round($userinfo['diskspace_used'] / 1024, $settings['panel']['decimal_places']);
 	$userinfo['traffic'] = round($userinfo['traffic'] / (1024 * 1024), $settings['panel']['decimal_places']);
 	$userinfo['traffic_used'] = round($userinfo['traffic_used'] / (1024 * 1024), $settings['panel']['decimal_places']);
-	$userinfo = str_replace_array('-1', $lng['customer']['unlimited'], $userinfo, 'customers domains diskspace traffic mysqls emails email_accounts email_forwarders email_quota email_autoresponder ftps tickets subdomains aps_packages');
+	$userinfo = str_replace_array('-1', $lng['customer']['unlimited'], $userinfo, 'customers domains diskspace traffic mysqls emails email_accounts email_forwarders email_quota ftps tickets subdomains');
 
 	$cron_last_runs = getCronjobsLastRun();
 	$outstanding_tasks = getOutstandingTasks();
diff --git a/customer_autoresponder.php b/customer_autoresponder.php
deleted file mode 100644
index 2e6f460a..00000000
--- a/customer_autoresponder.php
+++ /dev/null
@@ -1,323 +0,0 @@
-<?php
-
-/**
- * This file is part of the Froxlor project.
- * Copyright (c) 2003-2009 the SysCP Team (see authors).
- * Copyright (c) 2010 the Froxlor Team (see authors).
- *
- * For the full copyright and license information, please view the COPYING
- * file that was distributed with this source code. You can also view the
- * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
- *
- * @copyright  (c) the authors
- * @author     Florian Lippert <flo@syscp.org> (2003-2009)
- * @author     Froxlor team <team@froxlor.org> (2010-)
- * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
- * @package    Panel
- *
- */
-
-define('AREA', 'customer');
-require './lib/init.php';
-
-if ($action == 'add') {
-	// Create new autoresponder
-	if (isset($_POST['send'])
-	   && $_POST['send'] == 'send'
-	) {
-		$account = trim($_POST['account']);
-		$subject = trim($_POST['subject']);
-		$message = trim($_POST['message']);
-
-		$date_from_off = isset($_POST['date_from_off']) ? -1 : 0;
-		$date_until_off = isset($_POST['date_until_off']) ? -1 : 0;
-
-		/*
-		 * @TODO validate date (DD-MM-YYYY)
-		 */
-		$ts_from = -1;
-		$ts_until = -1;
-
-		if ($date_from_off > -1) {
-			$date_from = $_POST['date_from'];
-			$ts_from = mktime(0, 0, 0, substr($date_from, 3, 2), substr($date_from, 0, 2), substr($date_from, 6, 4));
-		}
-		if ($date_until_off > -1) {
-			$date_until = $_POST['date_until'];
-			$ts_until = mktime(0, 0, 0, substr($date_until, 3, 2), substr($date_until, 0, 2), substr($date_until, 6, 4));
-		}
-
-		if (empty($account)
-		   || empty($subject)
-		   || empty($message)
-		) {
-			standard_error('missingfields');
-		}
-		
-		// Does account exist?
-		$stmt = Database::prepare("SELECT `email` FROM `" . TABLE_MAIL_USERS . "`
-			WHERE `customerid` = :customerid
-			AND `email` = :account
-			LIMIT 0,1"
-		);
-		Database::pexecute($stmt, array("account" => $account, "customerid" => $userinfo['customerid']));
-		if (Database::num_rows() == 0) {
-			standard_error('accountnotexisting');
-		}
-
-		// Does autoresponder exist?
-		$stmt = Database::prepare("SELECT `email` FROM `" . TABLE_MAIL_AUTORESPONDER . "`
-			WHERE `customerid` = :customerid
-			AND `email` = :account
-			LIMIT 0,1"
-		);
-		Database::pexecute($stmt, array("account" => $account, "customerid" => $userinfo['customerid']));
-		if (Database::num_rows() == 1) {
-			standard_error('autoresponderalreadyexists');
-		}
-		
-		// Create autoresponder
-		$stmt = Database::prepare("INSERT INTO `" . TABLE_MAIL_AUTORESPONDER . "`
-			SET `email` = :account,
-			`message` = :message,
-			`enabled` = :enabled,
-			`date_from` = :date_from,
-			`date_until` = :date_until,
-			`subject` = :subject,
-			`customerid` = :customerid"
-		);
-		$params = array(
-			"account" => $account,
-			"message" => $message,
-			"enabled" => $_POST['active'],
-			"date_from" => $ts_from,
-			"date_until" => $ts_until,
-			"subject" => $subject,
-			"customerid" => $userinfo['customerid']
-		);
-		Database::pexecute($stmt, $params);
-		
-		// Update email_autoresponder_used count
-		$stmt = Database::prepare("UPDATE `" . TABLE_PANEL_CUSTOMERS . "`
-			SET `email_autoresponder_used` = `email_autoresponder_used` + 1
-			WHERE `customerid` = :customerid"
-		);
-		Database::pexecute($stmt, array("customerid" => $userinfo['customerid']));
-		redirectTo($filename, Array('s' => $s));
-	}
-
-	// Get accounts
-	$params = array("customerid" => $userinfo['customerid']);
-	$acc_stmt = Database::prepare("SELECT `email` FROM `" . TABLE_MAIL_USERS . "`
-		WHERE `customerid` = :customerid
-		AND `email` NOT IN (SELECT `email` FROM `" . TABLE_MAIL_AUTORESPONDER . "`)
-		ORDER BY email ASC"
-	);
-	Database::pexecute($acc_stmt, $params);
-	if (Database::num_rows() == 0) {
-		standard_error('noemailaccount');
-	}
-
-	$accounts = '';
-	while ($row = $acc_stmt->fetch(PDO::FETCH_ASSOC)) {
-		$accounts .= '<option value="' . $row['email'] . '">' . $row['email'] . '</option>';
-	}
-
-	$date_from_off = makecheckbox('date_from_off', $lng['panel']['not_activated'], '-1', false, '-1', true, true);
-	$date_until_off = makecheckbox('date_until_off', $lng['panel']['not_activated'], '-1', false, '-1', true, true);
-
-	//$isactive = makeyesno('active', '1', '0', '1');
-
-	$autoresponder_add_data = include_once dirname(__FILE__).'/lib/formfields/customer/autoresponder/formfield.autoresponder_add.php';
-	$autoresponder_add_form = htmlform::genHTMLForm($autoresponder_add_data);
-
-	$title = $autoresponder_add_data['autoresponder_add']['title'];
-	$image = $autoresponder_add_data['autoresponder_add']['image'];
-
-	eval("echo \"" . getTemplate('autoresponder/autoresponder_add') . "\";");
-} elseif ($action == 'edit') {
-	// Edit autoresponder
-	if (isset($_POST['send'])
-	   && $_POST['send'] == 'send'
-	) {
-		$account = trim($_POST['account']);
-		$subject = trim($_POST['subject']);
-		$message = trim($_POST['message']);
-
-		$date_from_off = isset($_POST['date_from_off']) ? -1 : 0;
-		$date_until_off = isset($_POST['date_until_off']) ? -1 : 0;
-
-		/*
-		 * @TODO validate date (DD-MM-YYYY)
-		 */
-		$ts_from = -1;
-		$ts_until = -1;
-
-		if ($date_from_off > -1) {
-			$date_from = $_POST['date_from'];
-			$ts_from = mktime(0, 0, 0, substr($date_from, 3, 2), substr($date_from, 0, 2), substr($date_from, 6, 4));
-		}
-		if ($date_until_off > -1) {
-			$date_until = $_POST['date_until'];
-			$ts_until = mktime(0, 0, 0, substr($date_until, 3, 2), substr($date_until, 0, 2), substr($date_until, 6, 4));
-		}
-
-		if (empty($account)
-		   || empty($subject)
-		   || empty($message)
-		) {
-			standard_error('missingfields');
-		}
-
-		// Does account exist?
-		$stmt = Database::prepare("SELECT `email` FROM `" . TABLE_MAIL_USERS . "`
-			WHERE `customerid` = :customerid
-			AND `email` = :account
-			LIMIT 0,1"
-		);
-		Database::pexecute($stmt, array("account" => $account, "customerid" => $userinfo['customerid']));
-		if (Database::num_rows() == 0) {
-			standard_error('accountnotexisting');
-		}
-
-		// Does autoresponder exist?
-		$stmt = Database::prepare("SELECT `email` FROM `" . TABLE_MAIL_AUTORESPONDER . "`
-			WHERE `customerid` = :customerid
-			AND `email` = :account
-			LIMIT 0,1"
-		);
-		Database::pexecute($stmt, array("account" => $account, "customerid" => $userinfo['customerid']));
-		if (Database::num_rows() == 0) {
-			standard_error('invalidautoresponder');
-		}
-
-		// Update autoresponder
-		$stmt = Database::prepare("UPDATE `" . TABLE_MAIL_AUTORESPONDER . "`
-			SET `message` = :message,
-			`enabled` = :enabled,
-			`date_from` = :date_from,
-			`date_until` = :date_until,
-			`subject` = :subject
-			WHERE `email` = :account
-			AND `customerid` = :customerid"
-		);
-		$params = array(
-			"account" => $account,
-			"message" => $message,
-			"enabled" => $_POST['active'],
-			"date_from" => $ts_from,
-			"date_until" => $ts_until,
-			"subject" => $subject,
-			"customerid" => $userinfo['customerid']
-		);
-		Database::pexecute($stmt, $params);
-		redirectTo($filename, Array('s' => $s));
-	}
-
-	$email = trim(htmlspecialchars($_GET['email']));
-
-	// Get account data
-	$acc_stmt = Database::prepare("SELECT * FROM `" . TABLE_MAIL_AUTORESPONDER . "`
-		WHERE `customerid` = :customerid
-		AND `email` = :account
-		LIMIT 0,1"
-	);
-	Database::pexecute($acc_stmt, array("account" => $email, "customerid" => $userinfo['customerid']));
-	if (Database::num_rows() == 0) {
-		standard_error('invalidautoresponder');
-	}
-
-	$row = $acc_stmt->fetch(PDO::FETCH_ASSOC);
-	$subject = htmlspecialchars($row['subject']);
-	$message = htmlspecialchars($row['message']);
-
-	$date_from = (int)$row['date_from'];
-	$date_until = (int)$row['date_until'];
-
-	if ($date_from == -1) {
-		$deactivated = '-1';
-		$date_from = '';
-	} else {
-		$deactivated = '0';
-		$date_from = date('d-m-Y', $date_from);
-	}
-	$date_from_off = makecheckbox('date_from_off', $lng['panel']['not_activated'], '-1', false, $deactivated, true, true);
-
-	if ($date_until == -1) {
-		$deactivated = '-1';
-		$date_until = '';
-	} else {
-		$deactivated = '0';
-		$date_until = date('d-m-Y', $date_until);
-	}
-	$date_until_off = makecheckbox('date_until_off', $lng['panel']['not_activated'], '-1', false, $deactivated, true, true);
-
-	//$isactive = makeyesno('active', '1', '0', $row['enabled']);
-
-	$autoresponder_edit_data = include_once dirname(__FILE__).'/lib/formfields/customer/autoresponder/formfield.autoresponder_edit.php';
-	$autoresponder_edit_form = htmlform::genHTMLForm($autoresponder_edit_data);
-
-	$title = $autoresponder_edit_data['autoresponder_edit']['title'];
-	$image = $autoresponder_edit_data['autoresponder_edit']['image'];
-
-	eval("echo \"" . getTemplate('autoresponder/autoresponder_edit') . "\";");
-} elseif ($action == 'delete') {
-	// Delete autoresponder
-	if (isset($_POST['send']) && $_POST['send'] == 'send') {
-		$account = trim($_POST['account']);
-
-		// Does autoresponder exist?
-		$stmt = Database::prepare("SELECT `email` FROM `" . TABLE_MAIL_AUTORESPONDER . "`
-			WHERE `customerid` = :customerid
-			AND `email` = :account
-			LIMIT 0,1"
-		);
-		Database::pexecute($stmt, array("account" => $account, "customerid" => $userinfo['customerid']));
-		if (Database::num_rows() == 0) {
-			standard_error('invalidautoresponder');
-		}
-		
-		// Delete autoresponder
-		$stmt = Database::prepare("DELETE FROM `" . TABLE_MAIL_AUTORESPONDER . "`
-			WHERE `email` = :account
-			AND `customerid` = :customerid"
-		);
-		Database::pexecute($stmt, array("account" => $account, "customerid" => $userinfo['customerid']));
-			
-		// Update email_autoresponder_used count
-		$stmt = Database::prepare("UPDATE `" . TABLE_PANEL_CUSTOMERS . "`
-			SET `email_autoresponder_used` = `email_autoresponder_used` - 1
-			WHERE `customerid` = :customerid"
-		);
-		Database::pexecute($stmt, array("customerid" => $userinfo['customerid']));
-		redirectTo($filename, Array('s' => $s));
-	}
-
-	$email = trim(htmlspecialchars($_GET['email']));
-	ask_yesno('autoresponderdelete', $filename, array('action' => $action, 'account' => $email));
-} else {
-	// List existing autoresponders
-	$autoresponder = '';
-	$count = 0;
-	$stmt = Database::prepare("SELECT * FROM `" . TABLE_MAIL_AUTORESPONDER . "`
-		WHERE `customerid` = :customerid
-		ORDER BY email ASC"
-	);
-	Database::pexecute($stmt, array("customerid" => $userinfo['customerid']));
-
-	while ($row = $stmt->fetch(PDO::FETCH_ASSOC)) {
-		if ($row['date_from'] == -1 && $row['date_until'] == -1) {
-			$activated_date = $lng['panel']['not_activated'];
-		} elseif($row['date_from'] == -1 && $row['date_until'] != -1) {
-			$activated_date = $lng['autoresponder']['date_until'].': '.date('d-m-Y', $row['date_until']);
-		} elseif($row['date_from'] != -1 && $row['date_until'] == -1) {
-			$activated_date = $lng['autoresponder']['date_from'].': '.date('d-m-Y', $row['date_from']);
-		} else {
-			$activated_date = date('d-m-Y', $row['date_from']) . ' - ' . date('d-m-Y', $row['date_until']);
-		}
-		eval("\$autoresponder.=\"" . getTemplate('autoresponder/autoresponder_autoresponder') . "\";");
-		$count++;
-	}
-
-	eval("echo \"" . getTemplate('autoresponder/autoresponder') . "\";");
-}
diff --git a/customer_domains.php b/customer_domains.php
index eebc173b..975bc718 100644
--- a/customer_domains.php
+++ b/customer_domains.php
@@ -177,13 +177,6 @@ if($page == 'overview') {
 					}
 				}
 
-				/*
-				 * check for APS packages used with this domain, #110
-				 */
-				if(domainHasApsInstances($id)) {
-					standard_error('domains_cantdeletedomainwithapsinstances');
-				}
-
 				$log->logAction(USR_ACTION, LOG_INFO, "deleted subdomain '" . $idna_convert->decode($result['domain']) . "'");
 				$stmt = Database::prepare("DELETE FROM `" . TABLE_PANEL_DOMAINS . "` WHERE
 					`customerid` = :customerid
diff --git a/customer_ftp.php b/customer_ftp.php
index 3dbda933..ff497fdb 100644
--- a/customer_ftp.php
+++ b/customer_ftp.php
@@ -40,8 +40,7 @@ if ($page == 'overview') {
 		$paging = new paging($userinfo, TABLE_FTP_USERS, $fields, $settings['panel']['paging'], $settings['panel']['natsorting']);
 		
 		$result_stmt = Database::prepare("SELECT `id`, `username`, `homedir` FROM `" . TABLE_FTP_USERS . "`
-			WHERE `customerid`= :customerid 
-			AND `username` NOT LIKE '%_backup'" . $paging->getSqlWhere(true) . " " . $paging->getSqlOrderBy() . " " . $paging->getSqlLimit()
+			WHERE `customerid`= :customerid " . $paging->getSqlWhere(true) . " " . $paging->getSqlOrderBy() . " " . $paging->getSqlLimit()
 		);
 		Database::pexecute($result_stmt, array("customerid" => $userinfo['customerid']));
 		$ftps_count = Database::num_rows();
@@ -370,21 +369,6 @@ if ($page == 'overview') {
 						AND `id` = :id"
 					);
 					Database::pexecute($stmt, array("customerid" => $userinfo['customerid'], "id" => $id, "password" => $cryptPassword));
-						
-					// also update customers backup user password if password of main ftp user is changed
-					if(!preg_match('/' . $settings['customer']['ftpprefix'] . '/', $result['username'])) {
-						$stmt = Database::prepare("UPDATE `" . TABLE_FTP_USERS . "`
-							SET `password` = :password
-							WHERE `customerid` = :customerid
-							AND `username` = :username"
-						);
-						$params = array(
-							"password" => $cryptPassword,
-							"customerid" => $userinfo['customerid'],
-							"username" => $result['username'] . "_backup"
-						);
-						Database::pexecute($stmt, $params);
-					}
 				}
 				
 				if ($path != '') {
diff --git a/customer_index.php b/customer_index.php
index 5b8058f0..630bcda2 100644
--- a/customer_index.php
+++ b/customer_index.php
@@ -83,7 +83,7 @@ if ($page == 'overview') {
 	$userinfo['diskspace_used'] = round($userinfo['diskspace_used'] / 1024, $settings['panel']['decimal_places']);
 	$userinfo['traffic'] = round($userinfo['traffic'] / (1024 * 1024), $settings['panel']['decimal_places']);
 	$userinfo['traffic_used'] = round($userinfo['traffic_used'] / (1024 * 1024), $settings['panel']['decimal_places']);
-	$userinfo = str_replace_array('-1', $lng['customer']['unlimited'], $userinfo, 'diskspace traffic mysqls emails email_accounts email_forwarders email_quota email_autoresponder ftps tickets subdomains aps_packages');
+	$userinfo = str_replace_array('-1', $lng['customer']['unlimited'], $userinfo, 'diskspace traffic mysqls emails email_accounts email_forwarders email_quota ftps tickets subdomains');
 
 	$services_enabled = "";
 	$se = array();
diff --git a/lib/formfields/admin/customer/formfield.customer_add.php b/lib/formfields/admin/customer/formfield.customer_add.php
index 790a3068..3d7cb23c 100644
--- a/lib/formfields/admin/customer/formfield.customer_add.php
+++ b/lib/formfields/admin/customer/formfield.customer_add.php
@@ -185,14 +185,6 @@ return array(
 						'mandatory' => true,
 						'ul_field' => $email_quota_ul
 					),
-					'email_autoresponder' => array(
-						'label' => $lng['customer']['autoresponder'],
-						'type' => 'textul',
-						'value' => 0,
-						'maxlength' => 9,
-						'visible' => ($settings['autoresponder']['autoresponder_active'] == '1' ? true : false),
-						'ul_field' => $email_autoresponder_ul
-					),
 					'email_imap' => array(
 						'label' => $lng['customer']['email_imap'],
 						'type' => 'checkbox',
@@ -248,22 +240,6 @@ return array(
 						'values' => array(
 										array ('label' => $lng['panel']['yes'], 'value' => '1')
 									)
-					),
-					'backup_allowed' => array(
-						'label' => $lng['backup_allowed'].'?',
-						'type' => 'checkbox',
-						'values' => array(
-										array ('label' => $lng['panel']['yes'], 'value' => '1')
-									),
-						'visible' => ($settings['system']['backup_enabled'] == '1' ? true : false)
-					),
-					'number_of_aps_packages' => array(
-						'label' => $lng['aps']['numberofapspackages'],
-						'type' => 'textul',
-						'value' => 0,
-						'maxlength' => 9,
-						'visible' => ($settings['aps']['aps_active'] == '1' ? true : false),
-						'ul_field' => $number_of_aps_packages_ul
 					)
 				)
 			)
diff --git a/lib/formfields/admin/customer/formfield.customer_edit.php b/lib/formfields/admin/customer/formfield.customer_edit.php
index 9103c9b1..4a20bbee 100644
--- a/lib/formfields/admin/customer/formfield.customer_edit.php
+++ b/lib/formfields/admin/customer/formfield.customer_edit.php
@@ -193,14 +193,6 @@ return array(
 						'mandatory' => true,
 						'ul_field' => $email_quota_ul
 					),
-					'email_autoresponder' => array(
-						'label' => $lng['customer']['autoresponder'],
-						'type' => 'textul',
-						'value' => $result['email_autoresponder'],
-						'maxlength' => 9,
-						'visible' => ($settings['autoresponder']['autoresponder_active'] == '1' ? true : false),
-						'ul_field' => $email_autoresponder_ul
-					),
 					'email_imap' => array(
 						'label' => $lng['customer']['email_imap'],
 						'type' => 'checkbox',
@@ -257,23 +249,6 @@ return array(
 										array ('label' => $lng['panel']['yes'], 'value' => '1')
 									),
 						'value' => array($result['perlenabled'])
-					),
-					'backup_allowed' => array(
-						'label' => $lng['backup_allowed'].'?',
-						'type' => 'checkbox',
-						'values' => array(
-										array ('label' => $lng['panel']['yes'], 'value' => '1')
-									),
-						'value' => array($result['backup_allowed']),
-						'visible' => ($settings['system']['backup_enabled'] == '1' ? true : false)
-					),
-					'number_of_aps_packages' => array(
-						'label' => $lng['aps']['numberofapspackages'],
-						'type' => 'textul',
-						'value' => $result['aps_packages'],
-						'maxlength' => 9,
-						'visible' => ($settings['aps']['aps_active'] == '1' ? true : false),
-						'ul_field' => $number_of_aps_packages_ul
 					)
 				)
 			)
diff --git a/lib/formfields/customer/autoresponder/formfield.autoresponder_add.php b/lib/formfields/customer/autoresponder/formfield.autoresponder_add.php
deleted file mode 100644
index d4ca7e0a..00000000
--- a/lib/formfields/customer/autoresponder/formfield.autoresponder_add.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-
-/**
- * This file is part of the Froxlor project.
- * Copyright (c) 2010 the Froxlor Team (see authors).
- *
- * For the full copyright and license information, please view the COPYING
- * file that was distributed with this source code. You can also view the
- * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
- *
- * @copyright  (c) the authors
- * @author     Froxlor team <team@froxlor.org> (2010-)
- * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
- * @package    Formfields
- *
- */
-
-return array(
-	'autoresponder_add' => array(
-		'title' => $lng['autoresponder']['autoresponder_new'],
-		'image' => 'icons/autoresponder_add.png',
-		'sections' => array(
-			'section_a' => array(
-				'title' => $lng['autoresponder']['autoresponder_new'],
-				'image' => 'icons/autoresponder_add.png',
-				'fields' => array(
-					'account' => array(
-						'label' => $lng['autoresponder']['account'],
-						'type' => 'select',
-						'select_var' => $accounts,
-					),
-					'active' => array(
-						'label' => $lng['autoresponder']['active'],
-						'type' => 'checkbox',
-						'values' => array(
-										array ('label' => $lng['panel']['yes'], 'value' => '1')
-									),
-						'value' => array('1')
-					),
-					'date_from' => array(
-						'label' => $lng['autoresponder']['date_from'] . " (dd-mm-yyyy)",
-						'type' => 'textul',
-						'maxlength' => 10,
-						'ul_field' => $date_from_off,
-					),
-					'date_until' => array(
-						'label' => $lng['autoresponder']['date_until'] . " (dd-mm-yyyy)",
-						'type' => 'textul',
-						'maxlength' => 10,
-						'ul_field' => $date_until_off,
-					),
-					'subject' => array(
-						'label' => $lng['autoresponder']['subject'],
-						'type' => 'text',
-					),
-					'message' => array(
-						'style' => 'vertical-align:top;',
-						'label' => $lng['autoresponder']['message'],
-						'type' => 'textarea',
-						'cols' => 60,
-						'rows' => 12
-					)
-				)
-			)
-		)
-	)
-);
diff --git a/lib/formfields/customer/autoresponder/formfield.autoresponder_edit.php b/lib/formfields/customer/autoresponder/formfield.autoresponder_edit.php
deleted file mode 100644
index c4957bd1..00000000
--- a/lib/formfields/customer/autoresponder/formfield.autoresponder_edit.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-
-/**
- * This file is part of the Froxlor project.
- * Copyright (c) 2010 the Froxlor Team (see authors).
- *
- * For the full copyright and license information, please view the COPYING
- * file that was distributed with this source code. You can also view the
- * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
- *
- * @copyright  (c) the authors
- * @author     Froxlor team <team@froxlor.org> (2010-)
- * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
- * @package    Formfields
- *
- */
-
-return array(
-	'autoresponder_edit' => array(
-		'title' => $lng['autoresponder']['autoresponder_edit'],
-		'image' => 'icons/autoresponder_edit.png',
-		'sections' => array(
-			'section_a' => array(
-				'title' => $lng['autoresponder']['autoresponder_edit'],
-				'image' => 'icons/autoresponder_edit.png',
-				'fields' => array(
-					'account' => array(
-						'label' => $lng['autoresponder']['account'],
-						'type' => 'label',
-						'value' => $email,
-					),
-					'active' => array(
-						'label' => $lng['autoresponder']['active'],
-						'type' => 'checkbox',
-						'values' => array(
-										array ('label' => $lng['panel']['yes'], 'value' => '1')
-									),
-						'value' => array($row['enabled'])
-					),
-					'date_from' => array(
-						'label' => $lng['autoresponder']['date_from'] . " (dd-mm-yyyy)",
-						'type' => 'textul',
-						'maxlength' => 10,
-						'ul_field' => $date_from_off,
-						'value' => $date_from,
-					),
-					'date_until' => array(
-						'label' => $lng['autoresponder']['date_until'] . " (dd-mm-yyyy)",
-						'type' => 'textul',
-						'maxlength' => 10,
-						'ul_field' => $date_until_off,
-						'value' => $date_until,
-					),
-					'subject' => array(
-						'label' => $lng['autoresponder']['subject'],
-						'type' => 'text',
-						'value' => $subject
-					),
-					'message' => array(
-						'style' => 'vertical-align:top;',
-						'label' => $lng['autoresponder']['message'],
-						'type' => 'textarea',
-						'cols' => 60,
-						'rows' => 12,
-						'value' => $message,
-					)
-				)
-			)
-		)
-	)
-);
diff --git a/lib/functions/aps/function.domainHasApsInstances.php b/lib/functions/aps/function.domainHasApsInstances.php
deleted file mode 100644
index dd0e0bab..00000000
--- a/lib/functions/aps/function.domainHasApsInstances.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-/**
- * This file is part of the Froxlor project.
- * Copyright (c) 2010 the Froxlor Team (see authors).
- *
- * For the full copyright and license information, please view the COPYING
- * file that was distributed with this source code. You can also view the
- * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
- *
- * @copyright  (c) the authors
- * @author     Froxlor team <team@froxlor.org> (2010-)
- * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
- * @package    Language
- *
- */
-
-/**
- * Function domainHasApsInstances
- *
- * Checks if a given domain id
- * is used for APS instances
- * (if APS enabled, else always false)
- *
- * @param int domain-id
- *
- * @return boolean
- */
-function domainHasApsInstances($domainid = 0) {
-
-	global $settings, $theme;
-	
-	if ($settings['aps']['aps_active'] == '1') {
-		if ($domainid > 0) {
-			$instances_stmt = Database::prepare("
-				SELECT COUNT(`ID`) AS `count` FROM `" . TABLE_APS_SETTINGS . "`
-				WHERE `Name` = 'main_domain' AND `Value` = :domainid"
-			);
-			$instances = Database::pexecute_first($instances_stmt, array('domainid' => $domainid));
-
-			if ((int)$instances['count'] != 0) {
-				return true;
-			}
-		}
-	}
-	return false;
-}
diff --git a/lib/functions/aps/function.getXPathValue.php b/lib/functions/aps/function.getXPathValue.php
deleted file mode 100644
index 978ad3c8..00000000
--- a/lib/functions/aps/function.getXPathValue.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-/**
- * This file is part of the Froxlor project.
- * Copyright (c) 2010 the Froxlor Team (see authors).
- *
- * For the full copyright and license information, please view the COPYING
- * file that was distributed with this source code. You can also view the
- * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
- *
- * @copyright  (c) the authors
- * @author     Froxlor team <team@froxlor.org> (2010-)
- * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
- * @package    APS
- *
- */
-
-function getXPathValue($xmlobj = null, $path = null, $single = true)
-{
-	$result = null;
-	
-	$tmpxml = new DynamicProperties;
-	$tmpxml = ($xmlobj->xpath($path)) ? $xmlobj->xpath($path) : false;
-
-	if($result !== false)
-	{
-		$result = ($single == true) ? (string)$tmpxml[0] : $tmpxml;
-	}
-	return $result;
-}
diff --git a/lib/functions/aps/function.storeSettingApsPhpExtensions.php b/lib/functions/aps/function.storeSettingApsPhpExtensions.php
deleted file mode 100644
index a22b1cc3..00000000
--- a/lib/functions/aps/function.storeSettingApsPhpExtensions.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-/**
- * This file is part of the Froxlor project.
- * Copyright (c) 2003-2009 the SysCP Team (see authors).
- * Copyright (c) 2010 the Froxlor Team (see authors).
- *
- * For the full copyright and license information, please view the COPYING
- * file that was distributed with this source code. You can also view the
- * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
- *
- * @copyright  (c) the authors
- * @author     Florian Lippert <flo@syscp.org> (2003-2009)
- * @author     Froxlor team <team@froxlor.org> (2010-)
- * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
- * @package    Functions
- *
- */
-
-function storeSettingApsPhpExtensions($fieldname, $fielddata, $newfieldvalue)
-{
-	$returnvalue = storeSettingField($fieldname, $fielddata, $newfieldvalue);
-
-	if($returnvalue !== false && is_array($fielddata) && isset($fielddata['settinggroup']) && $fielddata['settinggroup'] == 'aps' && isset($fielddata['varname']) && $fielddata['varname'] == 'php-extension')
-	{
-		$newfieldvalue_array = explode(',', $newfieldvalue);
-
-		if(in_array('mcrypt', $newfieldvalue_array))
-		{
-			$functions = 'mcrypt_encrypt,mcrypt_decrypt';
-		}
-		else
-		{
-			$functions = '';
-		}
-		
-		if($functions != getSetting('aps', 'php-function'))
-		{
-			saveSetting('aps', 'php-function', $functions);
-		}
-	}
-
-	return $returnvalue;
-}
diff --git a/lib/functions/aps/function.storeSettingApsWebserverModules.php b/lib/functions/aps/function.storeSettingApsWebserverModules.php
deleted file mode 100644
index ef0c1c13..00000000
--- a/lib/functions/aps/function.storeSettingApsWebserverModules.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-/**
- * This file is part of the Froxlor project.
- * Copyright (c) 2003-2009 the SysCP Team (see authors).
- * Copyright (c) 2010 the Froxlor Team (see authors).
- *
- * For the full copyright and license information, please view the COPYING
- * file that was distributed with this source code. You can also view the
- * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
- *
- * @copyright  (c) the authors
- * @author     Florian Lippert <flo@syscp.org> (2003-2009)
- * @author     Froxlor team <team@froxlor.org> (2010-)
- * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
- * @package    Functions
- *
- */
-
-function storeSettingApsWebserverModules($fieldname, $fielddata, $newfieldvalue)
-{
-	if(is_array($fielddata) && isset($fielddata['settinggroup']) && $fielddata['settinggroup'] == 'aps' && isset($fielddata['varname']) && $fielddata['varname'] == 'webserver-module')
-	{
-		$newfieldvalue_array = explode(',', $newfieldvalue);
-
-		if(in_array('mod_rewrite', $newfieldvalue_array))
-		{
-			// Don't have to guess if we have to remove the leading comma as mod_rewrite is set anyways when we're here...
-			$newfieldvalue .= ',mod_rewrite.c';
-		}
-		
-		if(in_array('htaccess', $newfieldvalue_array))
-		{
-			$htaccess = 'htaccess';
-		}
-		else
-		{
-			$htaccess = '';
-		}
-		
-		if($htaccess != getSetting('aps', 'webserver-htaccess'))
-		{
-			saveSetting('aps', 'webserver-htaccess', $htaccess);
-		}
-	}
-
-	return storeSettingField($fieldname, $fielddata, $newfieldvalue);
-}
diff --git a/lib/functions/aps/function.sys_get_temp_dir.php b/lib/functions/aps/function.sys_get_temp_dir.php
deleted file mode 100644
index 0ae6b7b9..00000000
--- a/lib/functions/aps/function.sys_get_temp_dir.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-
-/**
- * This file is part of the Froxlor project.
- * Copyright (c) 2003-2009 the SysCP Team (see authors).
- * Copyright (c) 2010 the Froxlor Team (see authors).
- *
- * For the full copyright and license information, please view the COPYING
- * file that was distributed with this source code. You can also view the
- * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
- *
- * @copyright  (c) the authors
- * @author     Florian Lippert <flo@syscp.org> (2003-2009)
- * @author     Froxlor team <team@froxlor.org> (2010-)
- * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
- * @package    Functions
- *
- */
-
-if(!function_exists('sys_get_temp_dir'))
-{
-	/**
-	 * function will return the temporary directory where we can write data
-	 * function exists as a fallback for php versions lower than 5.2.1
-	 * source copied from php.net
-	 *
-	 * @author	Sven Skrabal <info@nexpa.de>
-	 */
-
-	function sys_get_temp_dir()
-	{
-		// Try to get from environment variable
-
-		if(!empty($_ENV['TMP']))
-		{
-			return realpath($_ENV['TMP']);
-		}
-		elseif(!empty($_ENV['TMPDIR']))
-		{
-			return realpath($_ENV['TMPDIR']);
-		}
-		elseif(!empty($_ENV['TEMP']))
-		{
-			return realpath($_ENV['TEMP']);
-		}
-		else
-		{
-			// Detect by creating a temporary file
-			// Try to use system's temporary directory
-			// as random name shouldn't exist
-
-			$temp_file = tempnam(md5(uniqid(rand(), true)), '');
-
-			if($temp_file)
-			{
-				$temp_dir = realpath(dirname($temp_file));
-				unlink($temp_file);
-				return $temp_dir;
-			}
-			else
-			{
-				return false;
-			}
-		}
-	}
-}
diff --git a/lib/functions/froxlor/function.CronjobFunctions.php b/lib/functions/froxlor/function.CronjobFunctions.php
index ca911ec4..3e2d6ac9 100644
--- a/lib/functions/froxlor/function.CronjobFunctions.php
+++ b/lib/functions/froxlor/function.CronjobFunctions.php
@@ -15,7 +15,7 @@
  *
  */
 
-/*
+/**
  * Function getNextCronjobs
  *
  * checks which cronjobs have to be executed
@@ -206,40 +206,6 @@ function getOutstandingTasks() {
 		}
 	}
 
-	$query2 = "SELECT DISTINCT `Task` FROM `".TABLE_APS_TASKS."` ORDER BY `Task` ASC";
-	$result2 = Database::query($query2);
-
-	while ($row2 = $result2->fetch(PDO::FETCH_ASSOC)) {
-		// install
-		if ($row2['Task'] == '1') {
-			$task_desc = $lng['tasks']['aps_task_install'];
-		}
-		// remove
-		elseif ($row2['Task'] == '2') {
-			$task_desc = $lng['tasks']['aps_task_remove'];
-		}
-		// reconfigure
-		elseif ($row2['Task'] == '3') {
-			$task_desc = $lng['tasks']['aps_task_reconfigure'];
-		}
-		// upgrade
-		elseif ($row2['Task'] == '4') {
-			$task_desc = $lng['tasks']['aps_task_upgrade'];
-		}
-		// system update
-		elseif ($row2['Task'] == '5') {
-			$task_desc = $lng['tasks']['aps_task_sysupdate'];
-		}
-		// system download
-		elseif ($row2['Task'] == '6') {
-			$task_desc = $lng['tasks']['aps_task_sysdownload'];
-		}
-
-		if($task_desc != '') {
-			$tasks .= '<li>'.$task_desc.'</li>';
-		}
-	}
-
 	if (trim($tasks) == '') {
 		$value .= '<li>'.$lng['tasks']['noneoutstanding'].'</li>';
 	} else {
diff --git a/lib/functions/froxlor/function.updateCounters.php b/lib/functions/froxlor/function.updateCounters.php
index 67e3f79d..21633e63 100644
--- a/lib/functions/froxlor/function.updateCounters.php
+++ b/lib/functions/froxlor/function.updateCounters.php
@@ -25,7 +25,6 @@
  * @author Florian Lippert <flo@syscp.org> (2003-2009)
  * @author Froxlor team <team@froxlor.org> (2010-)
  */
-
 function updateCounters($returndebuginfo = false) {
 	global $theme;
 	$returnval = array();
@@ -119,14 +118,6 @@ function updateCounters($returndebuginfo = false) {
 			$admin_resources[$customer['adminid']]['email_quota_used']+= intval_ressource($customer['email_quota']);
 		}
 
-		if(!isset($admin_resources[$customer['adminid']]['email_autoresponder_used'])) {
-			$admin_resources[$customer['adminid']]['email_autoresponder_used'] = 0;
-		}
-
-		if($customer['email_autoresponder'] != '-1') {
-			$admin_resources[$customer['adminid']]['email_autoresponder_used']+= intval_ressource($customer['email_autoresponder']);
-		}
-
 		if(!isset($admin_resources[$customer['adminid']]['subdomains_used'])) {
 			$admin_resources[$customer['adminid']]['subdomains_used'] = 0;
 		}
@@ -135,14 +126,6 @@ function updateCounters($returndebuginfo = false) {
 			$admin_resources[$customer['adminid']]['subdomains_used']+= intval_ressource($customer['subdomains']);
 		}
 
-		if(!isset($admin_resources[$customer['adminid']]['aps_packages_used'])) {
-			$admin_resources[$customer['adminid']]['aps_packages_used'] = 0;
-		}
-
-		if($customer['aps_packages'] != '-1') {
-			$admin_resources[$customer['adminid']]['aps_packages_used']+= intval_ressource($customer['aps_packages']);
-		}
-
 		$customer_mysqls_stmt = Database::prepare('SELECT COUNT(*) AS `number_mysqls` FROM `' . TABLE_PANEL_DATABASES . '`
 			WHERE `customerid` = :cid'
 		);
@@ -192,14 +175,6 @@ function updateCounters($returndebuginfo = false) {
 		$customer_email_quota_stmt = Database::prepare('SELECT SUM(`quota`) AS `email_quota` FROM `' . TABLE_MAIL_USERS . '` WHERE `customerid` = :cid');
 		$customer_email_quota = Database::pexecute_first($customer_email_quota_stmt, array("cid" => $customer['customerid']));
 		$customer['email_quota_used_new'] = (int)$customer_email_quota['email_quota'];
-		
-		$customer_email_autoresponder_stmt = Database::prepare('SELECT COUNT(*) AS `number_autoresponder` FROM `' . TABLE_MAIL_AUTORESPONDER . '` WHERE `customerid` = :cid');
-		$customer_email_autoresponder = Database::pexecute_first($customer_email_autoresponder_stmt, array("cid" => $customer['customerid']));
-		$customer['email_autoresponder_used_new'] = (int)$customer_email_autoresponder['number_autoresponder'];
-		
-		$customer_aps_packages_stmt = Database::prepare('SELECT COUNT(*) AS `number_apspackages` FROM `' . TABLE_APS_INSTANCES . '` WHERE `CustomerID` = :cid');
-		$customer_aps_packages = Database::pexecute_first($customer_aps_packages_stmt, array("cid" => $customer['customerid']));
-		$customer['aps_packages_used_new'] = (int)$customer_aps_packages['number_apspackages'];
 
 		$stmt = Database::prepare('UPDATE `' . TABLE_PANEL_CUSTOMERS . '` 
 			SET `mysqls_used` = :mysqls_used,
@@ -207,11 +182,9 @@ function updateCounters($returndebuginfo = false) {
 				`email_accounts_used` = :email_accounts_used,
 				`email_forwarders_used` = :email_forwarders_used,
 				`email_quota_used` = :email_quota_used,
-				`email_autoresponder_used` = :email_autoresponder_used,
 				`ftps_used` = :ftps_used, 
 				`tickets_used` = :tickets_used,
-				`subdomains_used` = :subdomains_used,
-				`aps_packages_used` = :aps_packages_used
+				`subdomains_used` = :subdomains_used
 			WHERE `customerid` = :cid'
 		);
 		$params = array(
@@ -220,11 +193,9 @@ function updateCounters($returndebuginfo = false) {
 			"email_accounts_used" => $customer['email_accounts_used_new'],
 			"email_forwarders_used" => $customer['email_forwarders_used_new'],
 			"email_quota_used" => $customer['email_quota_used_new'],
-			"email_autoresponder_used" => $customer['email_autoresponder_used_new'],
 			"ftps_used" => $customer['ftps_used_new'],
 			"tickets_used" => $customer['tickets_used_new'],
 			"subdomains_used" => $customer['subdomains_used_new'],
-			"aps_packages_used" => $customer['aps_packages_used_new'],
 			"cid" => $customer['customerid']
 		);
 		Database::pexecute($stmt, $params);
@@ -306,23 +277,11 @@ function updateCounters($returndebuginfo = false) {
 
 		$admin['email_quota_used_new'] = $admin_resources[$admin['adminid']]['email_quota_used'];
 
-		if(!isset($admin_resources[$admin['adminid']]['email_autoresponder_used'])) {
-			$admin_resources[$admin['adminid']]['email_autoresponder_used'] = 0;
-		}
-
-		$admin['email_autoresponder_used_new'] = $admin_resources[$admin['adminid']]['email_autoresponder_used'];
-
 		if(!isset($admin_resources[$admin['adminid']]['subdomains_used'])) {
 			$admin_resources[$admin['adminid']]['subdomains_used'] = 0;
 		}
 
 		$admin['subdomains_used_new'] = $admin_resources[$admin['adminid']]['subdomains_used'];
-		
-		if(!isset($admin_resources[$admin['adminid']]['aps_packages_used'])) {
-			$admin_resources[$admin['adminid']]['aps_packages_used'] = 0;
-		}
-
-		$admin['aps_packages_used_new'] = $admin_resources[$admin['adminid']]['aps_packages_used'];
 
 		$stmt = Database::prepare('UPDATE `' . TABLE_PANEL_ADMINS . '` 
 			SET `customers_used` = :customers_used,
@@ -333,12 +292,10 @@ function updateCounters($returndebuginfo = false) {
 				`email_accounts_used` = :email_accounts_used,
 				`email_forwarders_used` = :email_forwarders_used,
 				`email_quota_used` = :email_quota_used,
-				`email_autoresponder_used` = :email_autoresponder_used,
 				`ftps_used` = :ftps_used, 
 				`tickets_used` = :tickets_used,
 				`subdomains_used` = :subdomains_used,
-				`traffic_used` = :traffic_used,
-				`aps_packages_used` = :aps_packages_used
+				`traffic_used` = :traffic_used
 			WHERE `adminid` = :aid'
 		);
 		$params = array(
@@ -350,12 +307,10 @@ function updateCounters($returndebuginfo = false) {
 			"email_accounts_used" => $admin['email_accounts_used_new'],
 			"email_forwarders_used" => $admin['email_forwarders_used_new'],
 			"email_quota_used" => $admin['email_quota_used_new'],
-			"email_autoresponder_used" => $admin['email_autoresponder_used_new'],
 			"ftps_used" => $admin['ftps_used_new'],
 			"tickets_used" => $admin['tickets_used_new'],
 			"subdomains_used" => $admin['subdomains_used_new'],
 			"traffic_used" => $admin['traffic_used_new'],
-			"aps_packages_used" => $admin['aps_packages_used_new'],
 			"aid" => $admin['adminid']
 		);
 		Database::pexecute($stmt, $params);
diff --git a/lib/navigation/00.froxlor.main.php b/lib/navigation/00.froxlor.main.php
index 266ce010..c0050a40 100644
--- a/lib/navigation/00.froxlor.main.php
+++ b/lib/navigation/00.froxlor.main.php
@@ -59,12 +59,6 @@ return array (
 					'label' => $lng['emails']['emails_add'],
 					'required_resources' => 'emails'
 				),
-				array (
-					'url' => 'customer_autoresponder.php',
-					'label' => $lng['menue']['email']['autoresponder'],
-					'required_resources' => 'emails',
-					'show_element' => ( getSetting('autoresponder', 'autoresponder_active') == true ),
-				),
 				array (
 					'url' => getSetting('panel', 'webmail_url'),
 					'new_window' => true,
@@ -130,11 +124,6 @@ return array (
 					'url' => 'customer_extras.php?page=htaccess',
 					'label' => $lng['menue']['extras']['pathoptions'],
 				),
-				array (
-					'url' => 'customer_extras.php?page=backup',
-					'label' => $lng['backup'],
-					'required_resources' => 'backup_allowed',
-				),
 			),
 		),
 		'traffic' => array (
diff --git a/lib/navigation/20.aps.installer.php b/lib/navigation/20.aps.installer.php
deleted file mode 100644
index 28f2dc99..00000000
--- a/lib/navigation/20.aps.installer.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-
-/**
- * This file is part of the Froxlor project.
- * Copyright (c) 2003-2009 the SysCP Team (see authors).
- * Copyright (c) 2010 the Froxlor Team (see authors).
- *
- * For the full copyright and license information, please view the COPYING
- * file that was distributed with this source code. You can also view the
- * COPYING file online at http://files.froxlor.org/misc/COPYING.txt
- *
- * @copyright  (c) the authors
- * @author     Florian Lippert <flo@syscp.org> (2003-2009)
- * @author     Froxlor team <team@froxlor.org> (2010-)
- * @license    GPLv2 http://files.froxlor.org/misc/COPYING.txt
- * @package    Navigation
- *
- */
-
-return array (
-	'customer' => array (
-		'aps' => array (
-			'label' => $lng['customer']['aps'],
-			'required_resources' => 'phpenabled',
-			'show_element' => ( getSetting('aps', 'aps_active') == true ),
-			'elements' => array (
-				array (
-					'url' => 'customer_aps.php?action=overview',
-					'label' => $lng['aps']['overview'],
-				),
-				array (
-					'url' => 'customer_aps.php?action=customerstatus',
-					'label' => $lng['aps']['status'],
-				),
-				array (
-					'url' => 'customer_aps.php?action=search',
-					'label' => $lng['aps']['search'],
-				),
-			),
-		),
-	),
-	'admin' => array (
-		'aps' => array (
-			'label' => $lng['admin']['aps'],
-			'required_resources' => 'can_manage_aps_packages',
-			'show_element' => ( getSetting('aps', 'aps_active') == true ),
-			'elements' => array (
-				array (
-					'url' => 'admin_aps.php?action=upload',
-					'label' => $lng['aps']['upload'],
-				),
-				array (
-					'url' => 'admin_aps.php?action=scan',
-					'label' => $lng['aps']['scan'],
-				),
-				array (
-					'url' => 'admin_aps.php?action=managepackages',
-					'label' => $lng['aps']['managepackages'],
-				),
-				array (
-					'url' => 'admin_aps.php?action=manageinstances',
-					'label' => $lng['aps']['manageinstances'],
-				),
-			),
-		),
-	),
-);
-?>
\ No newline at end of file
diff --git a/templates/Froxlor/admin/aps/askyesno.tpl b/templates/Froxlor/admin/aps/askyesno.tpl
deleted file mode 100644
index e8002ffb..00000000
--- a/templates/Froxlor/admin/aps/askyesno.tpl
+++ /dev/null
@@ -1,24 +0,0 @@
-<div class="messagewrapper">
-	<div class="warningcontainer bradius">
-		<div class="warningtitle">{$lng['question']['question']}</div>
-		<div class="warning">
-			$Message
-			<div style="text-align:right;">
-				<form name="continue" action="$filename" method="post">
-					<input type="submit" name="answer" value="{$lng['panel']['yes']}" />
-					<input type="hidden" name="save" value="1"/>
-					<input type="hidden" name="s" value="$s"/>
-					<input type="hidden" name="action" value="$action"/>
-					$Ids
-				</form>
-				&nbsp;
-				<form name="back" action="$filename" method="post">
-					<input type="submit" class="nobutton" name="submit" value="{$lng['panel']['no']}" />
-					<input type="hidden" name="action" value="$action"/>
-					<input type="hidden" name="s" value="$s"/>
-				</form>
-			</div>
-		</div>
-		</div>
-	</form>
-</div>
diff --git a/templates/Froxlor/admin/aps/footer.tpl b/templates/Froxlor/admin/aps/footer.tpl
deleted file mode 100644
index 35ee6c15..00000000
--- a/templates/Froxlor/admin/aps/footer.tpl
+++ /dev/null
@@ -1 +0,0 @@
-$footer
diff --git a/templates/Froxlor/admin/aps/header.tpl b/templates/Froxlor/admin/aps/header.tpl
deleted file mode 100644
index 6af88b30..00000000
--- a/templates/Froxlor/admin/aps/header.tpl
+++ /dev/null
@@ -1 +0,0 @@
-$header
diff --git a/templates/Froxlor/admin/aps/infobox.tpl b/templates/Froxlor/admin/aps/infobox.tpl
deleted file mode 100644
index d99e5788..00000000
--- a/templates/Froxlor/admin/aps/infobox.tpl
+++ /dev/null
@@ -1,24 +0,0 @@
-<if $Type == 0>
-<div class="warningcontainer bradius">
-	<div class="warningtitle">{$lng['success']['success']}</div>
-	<div class="warning">
-		$Message
-	</div>
-</div>
-</if>
-<if $Type == 1>
-<div class="errorcontainer bradius">
-	<div class="errortitle">{$lng['error']['error']}</div>
-	<div class="error">
-		$Message
-	</div>
-</div>
-</if>
-<if $Type == 2>
-<div class="successcontainer bradius">
-	<div class="successtitle">{$lng['success']['success']}</div>
-	<div class="success">
-		$Message
-	</div>
-</div>
-</if>
diff --git a/templates/Froxlor/admin/aps/manage_instances.tpl b/templates/Froxlor/admin/aps/manage_instances.tpl
deleted file mode 100644
index cabd79e2..00000000
--- a/templates/Froxlor/admin/aps/manage_instances.tpl
+++ /dev/null
@@ -1,58 +0,0 @@
-<article>
-		<header>
-			<h2>
-				<img src="templates/{$theme}/assets/img/icons/aps.png" alt="" />&nbsp;
-				{$lng['aps']['specialoptions']}
-			</h2>
-		</header>
-		
-		<section class="fullform bradiusodd">
-	        	<table class="formtable">
-						<tr>
-							<td><strong>{$lng['aps']['statistics']}</strong></td>
-							<td>$Statistics</td>
-						</tr>
-				</table>
-		</fieldset>
-		<br /><br />
-		</section>
-</article>
-<br /><br />
-<article>
-		<header>
-			<h2>
-				<img src="templates/{$theme}/assets/img/icons/aps.png" alt="" />&nbsp;
-				{$lng['aps']['manageinstances']}
-			</h2>
-		</header>
-		
-		<section class="fullform bradiusodd">
-		<form action="$filename" method="post" enctype="application/x-www-form-urlencoded">
-				<fieldset>
-					<legend>Froxlor&nbsp;-&nbsp;{$lng['aps']['manageinstances']}</legend>
-					
-	        	<table class="formtable">
-				<thead>
-					<tr>
-						<th style="text-align:center;">{$lng['aps']['packagenameandstatus']}</th>
-						<th style="text-align:center;">{$lng['aps']['stopinstall']}</th>
-						<th style="text-align:center;">{$lng['aps']['uninstall']}</th>
-					</tr>
-				</thead>
-				<tbody>
-						{$Instances}
-						<td colspan="3"><input class="bottom" type="reset" value="{$lng['panel']['reset']}" />&nbsp;<input type="submit" name="save" value="{$lng['panel']['save']}" /></td>
-					</tr>
-				</tbody>
-				</table>
-				<p style="display: none;">
-					<input type="hidden" name="s" value="$s" />
-					<input type="hidden" name="page" value="$page" />
-					<input type="hidden" name="action" value="$action" />
-					<input type="hidden" name="send" value="send" />
-				</p>
-		</fieldset>
-		</form>
-		<br /><br />
-		</section>
-</article>
diff --git a/templates/Froxlor/admin/aps/manage_instances_detail.tpl b/templates/Froxlor/admin/aps/manage_instances_detail.tpl
deleted file mode 100644
index e085df7b..00000000
--- a/templates/Froxlor/admin/aps/manage_instances_detail.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-<tr>
-	<td  class="field_name_border_left" style="padding-left: 2em;">{$Row['name']}, {$Row['firstname']} <if $Row['company'] != ''> | {$Row['company']}</if> ({$Row['loginname']}): {$database}; {$main_domain}</td>
-	<td class="field_name" style="text-align:center;"><if isset($Stop) == true>$Stop</if></td>
-	<td class="field_name" style="text-align:center;"><if isset($Remove) == true>$Remove</if></td>
-</tr>
diff --git a/templates/Froxlor/admin/aps/manage_instances_package.tpl b/templates/Froxlor/admin/aps/manage_instances_package.tpl
deleted file mode 100644
index f2e4e06e..00000000
--- a/templates/Froxlor/admin/aps/manage_instances_package.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-<tr>
-	<td  class="field_display_border_left" colspan="3"><strong>{$Row['Name']} {$Row['Version']} (Release {$Row['Release']})</strong></td>
-</tr>
\ No newline at end of file
diff --git a/templates/Froxlor/admin/aps/manage_instances_status.tpl b/templates/Froxlor/admin/aps/manage_instances_status.tpl
deleted file mode 100644
index 9e0e3822..00000000
--- a/templates/Froxlor/admin/aps/manage_instances_status.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-<tr>
-	<td  class="title" colspan="3" style="font-size: 1.1em;"><strong>{$Caption}</strong></td>
-</tr>
diff --git a/templates/Froxlor/admin/aps/manage_packages.tpl b/templates/Froxlor/admin/aps/manage_packages.tpl
deleted file mode 100644
index ca3b367c..00000000
--- a/templates/Froxlor/admin/aps/manage_packages.tpl
+++ /dev/null
@@ -1,110 +0,0 @@
-<article>
-	<header>
-		<h2>
-			<img src="templates/{$theme}/assets/img/icons/aps.png" alt="" />&nbsp;
-			{$lng['aps']['specialoptions']}
-		</h2>
-	</header>
-
-	<section class="midform midformaps_2 bradiusodd">
-	
-		<form action="$filename" method="post" enctype="application/x-www-form-urlencoded">
-			<p style="margin-left:10px;">
-				<strong>{$lng['admin']['phpsettings']['actions']}</strong>
-			</p>
-			<p style="margin-left:10px;">
-				<input type="hidden" name="s" value="$s" />
-				<input type="hidden" name="action" value="$action" />
-				<input type="hidden" name="page" value="$page" />
-				<input type="hidden" name="save" value="save" />
-				<input type="submit" name="downloadallpackages" value="{$lng['aps']['downloadallpackages']}" />
-			</p>
-		</form>
-
-		<form action="$filename" method="post" enctype="application/x-www-form-urlencoded">
-			<p style="margin-left:10px;">
-				<input type="hidden" name="s" value="$s" />
-				<input type="hidden" name="action" value="$action" />
-				<input type="hidden" name="page" value="$page" />
-				<input type="hidden" name="save" value="save" />
-				<input type="submit" name="updateallpackages" value="{$lng['aps']['updateallpackages']}" />
-			</p>
-		</form>
-
-		<form action="$filename" method="post" enctype="application/x-www-form-urlencoded">
-			<p style="margin-left:10px;">
-				<input type="hidden" name="s" value="$s" />
-				<input type="hidden" name="action" value="$action" />
-				<input type="hidden" name="page" value="$page" />
-				<input type="hidden" name="save" value="save" />
-				<input type="submit" name="enablenewest" value="{$lng['aps']['enablenewest']}" />
-			</p>
-		</form>
-
-		<form action="$filename" method="post" enctype="application/x-www-form-urlencoded">
-			<p style="margin-left:10px;">
-				<input type="hidden" name="s" value="$s" />
-				<input type="hidden" name="action" value="$action" />
-				<input type="hidden" name="page" value="$page" />
-				<input type="hidden" name="save" value="save" />
-				<input type="submit" name="removeunused" value="{$lng['aps']['removeunused']}" />
-			</p>
-		</form>
-
-	</section>
-	<br />
-	<section class="midform bradiusodd">
-		<p style="margin-left:10px;"><strong>{$lng['aps']['statistics']}</strong></p>
-		<p style="margin-left:10px;">{$Statistics}</p>
-	</section>
-</article>
-<br />
-<article>
-	<header>
-		<h2>
-			<img src="templates/{$theme}/assets/img/icons/aps.png" alt="" />&nbsp;
-			{$lng['aps']['managepackages']}
-		</h2>
-	</header>
-
-	<section>
-	
-		<form action="$filename" method="post" enctype="application/x-www-form-urlencoded">
-
-			<table class="bradiusodd aps">
-			<thead>
-				<tr>
-					<th style="width:30%;">{$lng['aps']['packagenameandversion']}</th>
-					<th>{$lng['ticket']['status']}</th>
-					<th>{$lng['aps']['installations']}</th>
-					<th style="width:7%;">{$lng['aps']['lock']}</th>
-					<th style="width:7%;">{$lng['aps']['unlock']}</th>
-					<th style="width:7%;">{$lng['aps']['remove']}</th>
-				</tr>
-			</thead>
-			<tfoot>
-				<tr>
-					<td colspan="3" style="border-top:1px solid #666;"><strong>{$lng['aps']['allpackages']}</strong></td>
-					<td style="width:7%;text-align:center;border-top:1px solid #666;"><input type="radio" name="all" value="lock"/></td>
-					<td style="width:7%;text-align:center;border-top:1px solid #666;"><input type="radio" name="all" value="unlock"/></td>
-					<td style="width:7%;text-align:center;border-top:1px solid #666;"><input type="radio" name="all" value="remove"/></td>
-				</tr>
-			</tfoot>
-			<tbody>
-				{$Packages}
-			</tbody>
-			</table>
-
-			<p class="submit">
-				<input type="hidden" name="s" value="$s" />
-				<input type="hidden" name="action" value="$action" />
-				<input type="hidden" name="page" value="$page" />
-				<input type="reset" value="{$lng['panel']['reset']}"/>&nbsp;
-				<input type="submit" name="save" value="{$lng['panel']['save']}"/>
-			</p>
-
-		</form>
-	</section>
-
-</article>
-
diff --git a/templates/Froxlor/admin/aps/manage_packages_detail.tpl b/templates/Froxlor/admin/aps/manage_packages_detail.tpl
deleted file mode 100644
index 719f1a34..00000000
--- a/templates/Froxlor/admin/aps/manage_packages_detail.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-<tr>
-	<td>{$Row2['Version']} (Release {$Row2['Release']})</td>
-	<td><if $Row2['Status'] == PACKAGE_LOCKED>{$lng['aps']['package_locked']}</if><if $Row2['Status'] == PACKAGE_ENABLED>{$lng['aps']['package_enabled']}</if></td>
-	<td>{$Installations}</td>
-	<td style="text-align:center;">$Lock</td>
-	<td style="text-align:center;">$Unlock</td>
-	<td style="text-align:center;"><if $Installations == 0>$Remove</if></td>
-</tr>
diff --git a/templates/Froxlor/admin/aps/manage_packages_download.tpl b/templates/Froxlor/admin/aps/manage_packages_download.tpl
deleted file mode 100644
index e2eceaf7..00000000
--- a/templates/Froxlor/admin/aps/manage_packages_download.tpl
+++ /dev/null
@@ -1,30 +0,0 @@
-<article>
-	<header>
-		<h2>
-			<img src="templates/{$theme}/assets/img/icons/aps.png" alt="" />&nbsp;
-			{$lng['aps']['specialoptions']}
-		</h2>
-	</header>
-
-	<section class="midform midformaps_2 bradiusodd">
-	
-		<form action="$filename" method="post" enctype="application/x-www-form-urlencoded">
-			<fieldset>
-			<legend>Froxlor&nbsp;-&nbsp;{$lng['aps']['specialoptions']}</legend>
-			<p>
-				<strong>{$lng['admin']['phpsettings']['actions']}</strong>
-			</p>
-			<p class="submit">
-				<input type="hidden" name="s" value="$s" />
-				<input type="hidden" name="action" value="$action" />
-				<input type="hidden" name="page" value="$page" />
-				<input type="hidden" name="save" value="save" />
-				<input type="submit" name="downloadallpackages" value="{$lng['aps']['downloadallpackages']}" />
-			</p>
-			</fieldset>
-		</form>
-
-	</section>
-
-</article>
-
diff --git a/templates/Froxlor/admin/aps/manage_packages_row.tpl b/templates/Froxlor/admin/aps/manage_packages_row.tpl
deleted file mode 100644
index 4b658828..00000000
--- a/templates/Froxlor/admin/aps/manage_packages_row.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-<tr>
-	<td colspan="6" style="border-top: 1px solid #666;border-bottom:1px solid #666;"><strong>{$Row['Name']}</strong></td>
-</tr>
diff --git a/templates/Froxlor/admin/aps/upload.tpl b/templates/Froxlor/admin/aps/upload.tpl
deleted file mode 100644
index 7744e666..00000000
--- a/templates/Froxlor/admin/aps/upload.tpl
+++ /dev/null
@@ -1,29 +0,0 @@
-<article>
-	<header>
-		<h2>
-			<img src="templates/{$theme}/assets/img/icons/aps_upload.png" alt="" />&nbsp;
-			{$lng['aps']['upload']}
-		</h2>
-	</header>
-
-	<section class="midform midformaps_1 bradiusodd">
-	
-		<form action="$filename" method="post" enctype="multipart/form-data">
-			<fieldset>
-				<legend>Froxlor&nbsp;-&nbsp;{$lng['aps']['upload']}</legend>
-				<p>
-					<strong>{$lng['aps']['upload_description']}</strong><br />
-					<a href="http://www.apsstandard.org/" rel="external">http://www.apsstandard.org/</a>
-				</p>
-				{$Output}
-
-				<input type="hidden" name="s" value="$s" />
-				<input type="hidden" name="page" value="$page" />
-				<input type="hidden" name="action" value="$action" />
-				<input type="submit" value="{$lng['aps']['upload']}" />
-			</fieldset>
-		</form>
-	</section>
-
-</article>
-
diff --git a/templates/Froxlor/admin/index/index.tpl b/templates/Froxlor/admin/index/index.tpl
index a75ce883..d87ae4e0 100644
--- a/templates/Froxlor/admin/index/index.tpl
+++ b/templates/Froxlor/admin/index/index.tpl
@@ -57,18 +57,6 @@ $header
 			<td>{$overview['email_quota_used']} ({$userinfo['email_quota_used']}/{$userinfo['email_quota']})</td>
 		</tr>
 		</if>
-		<if $settings['autoresponder']['autoresponder_active'] == 1>
-		<tr>
-			<td>{$lng['customer']['autoresponder']}  ({$lng['admin']['usedmax']}):</td>
-			<td>{$userinfo['email_autoresponder_used']} ({$userinfo['email_autoresponder']})</td>
-		</tr>
-		</if>
-		<if (int)$settings['aps']['aps_active'] == 1>
-		<tr>
-			<td>{$lng['aps']['numberofapspackages']} ({$lng['admin']['used']} ({$lng['admin']['assignedmax']})):</td>
-			<td>{$overview['aps_packages_used']} ({$userinfo['aps_packages_used']}/{$userinfo['aps_packages']})</td>
-		</tr>
-		</if>
 		<tr>
 			<td>{$lng['customer']['ftps']} ({$lng['admin']['used']} ({$lng['admin']['assignedmax']})):</td>
 			<td>{$overview['ftps_used']} ({$userinfo['ftps_used']}/{$userinfo['ftps']})</td>
diff --git a/templates/Froxlor/admin/settings/updatecounters_row_admin.tpl b/templates/Froxlor/admin/settings/updatecounters_row_admin.tpl
index 7ec08fba..58bff147 100644
--- a/templates/Froxlor/admin/settings/updatecounters_row_admin.tpl
+++ b/templates/Froxlor/admin/settings/updatecounters_row_admin.tpl
@@ -47,12 +47,6 @@
 							<td><span <if $admin['email_quota_used'] == $admin['email_quota_used_new']>style="color:green"<else>style="color:red"</if>><b>{$admin['email_quota_used']} -&gt; {$admin['email_quota_used_new']}</b></span></td>
 						</tr>
 						</if>
-						<if $settings['autoresponder']['autoresponder_active'] == 1>
-						<tr>
-							<td>{$lng['customer']['autoresponder']}:</td>
-							<td><span <if $admin['email_autoresponder_used'] == $admin['email_autoresponder_used_new']>style="color:green"<else>style="color:red"</if>><b>{$admin['email_autoresponder_used']} -&gt; {$admin['email_autoresponder_used_new']}</b></span></td>
-						</tr>
-						</if>
 						<tr>
 							<td>{$lng['customer']['ftps']}:</td>
 							<td><span <if $admin['ftps_used'] == $admin['ftps_used_new']>style="color:green"<else>style="color:red"</if>><b>{$admin['ftps_used']} -&gt; {$admin['ftps_used_new']}</b></span></td>
@@ -63,12 +57,6 @@
 							<td><span <if $admin['tickets_used'] == $admin['tickets_used_new']>style="color:green"<else>style="color:red"</if>><b>{$admin['tickets_used']} -&gt; {$admin['tickets_used_new']}</b></span></td>
 						</tr>
 						</if>
-						<if $settings['aps']['aps_active'] == '1'>
-						<tr>
-							<td>{$lng['customer']['aps']}:</td>
-							<td><span <if $admin['aps_packages_used'] == $admin['aps_packages_used_new']>style="color:green"<else>style="color:red"</if>><b>{$admin['aps_packages_used']} -&gt; {$admin['aps_packages_used_new']}</b></span></td>
-						</tr>
-						</if>
 					</table>
 					<br /><br />
 				</section>
diff --git a/templates/Froxlor/admin/settings/updatecounters_row_customer.tpl b/templates/Froxlor/admin/settings/updatecounters_row_customer.tpl
index 4dc0bb83..81f37d13 100644
--- a/templates/Froxlor/admin/settings/updatecounters_row_customer.tpl
+++ b/templates/Froxlor/admin/settings/updatecounters_row_customer.tpl
@@ -31,12 +31,6 @@
 							<td><span <if $customer['email_quota_used'] == $customer['email_quota_used_new']>style="color:green"<else>style="color:red"</if>><b>{$customer['email_quota_used']} -&gt; {$customer['email_quota_used_new']}</b></span></td>
 						</tr>
 						</if>
-						<if $settings['autoresponder']['autoresponder_active'] == 1>
-						<tr>
-							<td>{$lng['customer']['autoresponder']}:</td>
-							<td><span <if $customer['email_autoresponder_used'] == $customer['email_autoresponder_used_new']>style="color:green"<else>style="color:red"</if>><b>{$customer['email_autoresponder_used']} -&gt; {$customer['email_autoresponder_used_new']}</b></span></td>
-						</tr>
-						</if>
 						<tr>
 							<td>{$lng['customer']['ftps']}:</td>
 							<td><span <if $customer['ftps_used'] == $customer['ftps_used_new']>style="color:green"<else>style="color:red"</if>><b>{$customer['ftps_used']} -&gt; {$customer['ftps_used_new']}</b></span></td>
@@ -47,12 +41,6 @@
 							<td><span <if $customer['tickets_used'] == $customer['tickets_used_new']>style="color:green"<else>style="color:red"</if>><b>{$customer['tickets_used']} -&gt; {$customer['tickets_used_new']}</b></span></td>
 						</tr>
 						</if>
-						<if $settings['aps']['aps_active'] == '1'>
-						<tr>
-							<td>{$lng['customer']['aps']}:</td>
-							<td><span <if $customer['aps_packages_used'] == $customer['aps_packages_used_new']>style="color:green"<else>style="color:red"</if>><b>{$customer['aps_packages_used']} -&gt; {$customer['aps_packages_used_new']}</b></span></td>
-						</tr>
-						</if>
 					</table>
 					<br /><br />
 				</section>
diff --git a/templates/Froxlor/customer/aps/askyesno.tpl b/templates/Froxlor/customer/aps/askyesno.tpl
deleted file mode 100644
index d43b9b84..00000000
--- a/templates/Froxlor/customer/aps/askyesno.tpl
+++ /dev/null
@@ -1,25 +0,0 @@
-<div class="messagewrapper">
-	<div class="warningcontainer bradius">
-		<div class="warningtitle">{$lng['question']['question']}</div>
-		<div class="warning">
-			$Message
-			<div style="text-align:right;">
-				<form name="continue" action="$filename" method="post">
-					<input type="submit" name="answer" value="{$lng['panel']['yes']}" />
-					<input type="hidden" name="save" value="1"/>
-					<input type="hidden" name="s" value="$s"/>
-					<input type="hidden" name="action" value="$action"/>
-					$Ids
-				</form>
-				&nbsp;
-				<form name="back" action="$filename" method="post">
-					<input type="submit" name="submit" value="{$lng['panel']['no']}" />
-					<input type="hidden" name="action" value="<if isset($action_alt)>$action_alt<else>$action</if>"/>
-					<input type="hidden" name="s" value="$s"/>
-				</form>
-			</div>
-		</div>
-		</div>
-	</form>
-</div>
-
diff --git a/templates/Froxlor/customer/aps/data.tpl b/templates/Froxlor/customer/aps/data.tpl
deleted file mode 100644
index 06e76872..00000000
--- a/templates/Froxlor/customer/aps/data.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-<if $Groupname != ''>
-<tr>
-	<td class="title" colspan="3"><strong>$Groupname</strong></td>
-</tr>
-</if>
-<tr>
-	<td class="field_name_border_left" valign="top" width="25%">$Fieldname</td>
-	<td class="field_display" colspan="3">$Fieldvalue</td>
-</tr>
diff --git a/templates/Froxlor/customer/aps/footer.tpl b/templates/Froxlor/customer/aps/footer.tpl
deleted file mode 100644
index 35ee6c15..00000000
--- a/templates/Froxlor/customer/aps/footer.tpl
+++ /dev/null
@@ -1 +0,0 @@
-$footer
diff --git a/templates/Froxlor/customer/aps/header.tpl b/templates/Froxlor/customer/aps/header.tpl
deleted file mode 100644
index 6af88b30..00000000
--- a/templates/Froxlor/customer/aps/header.tpl
+++ /dev/null
@@ -1 +0,0 @@
-$header
diff --git a/templates/Froxlor/customer/aps/infobox.tpl b/templates/Froxlor/customer/aps/infobox.tpl
deleted file mode 100644
index b55608f7..00000000
--- a/templates/Froxlor/customer/aps/infobox.tpl
+++ /dev/null
@@ -1,25 +0,0 @@
-<if $Type == 0>
-<div class="warningcontainer bradius">
-        <div class="warningtitle">{$lng['success']['success']}</div>
-        <div class="warning">
-                $Message
-        </div>
-</div>
-</if>
-<if $Type == 1>
-<div class="errorcontainer bradius">
-        <div class="errortitle">{$lng['error']['error']}</div>
-        <div class="error">
-                $Message
-        </div>
-</div>
-</if>
-<if $Type == 2>
-<div class="successcontainer bradius">
-        <div class="successtitle">{$lng['success']['success']}</div>
-        <div class="success">
-                $Message
-        </div>
-</div>
-</if>
-
diff --git a/templates/Froxlor/customer/aps/installer.tpl b/templates/Froxlor/customer/aps/installer.tpl
deleted file mode 100644
index 8e2bfda2..00000000
--- a/templates/Froxlor/customer/aps/installer.tpl
+++ /dev/null
@@ -1,42 +0,0 @@
-<article>
-	<header>
-		<h2>
-			<img src="templates/{$theme}/assets/img/icons/aps.png" alt="{$Xml->name}" />&nbsp;
-			{$Xml->name}
-		</h2>
-	</header>
-	
-	<section class="fullform bradiusodd">
-
-			<form action="$filename" method="post" enctype="application/x-www-form-urlencoded">
-				<fieldset>
-					<legend>Froxlor&nbsp;-&nbsp;{$Xml->name}</legend>
-
-					<table class="formtable">
-						<tr>
-							<td colspan="2"><strong>{$lng['aps']['install_wizard']}</strong>
-							<if $ErrorMessage != 0>
-								<div class="dataerror">{$lng['aps']['wizard_error']}</div>
-							</if>
-							</td>
-							<td style="text-align: center; padding: 10px; background-color:#FFFFFF;"><img src="{$Icon}" alt="{$Xml->name} Icon"/></td>
-						</tr>
-						$Data
-						<tr>
-							<td colspan="3">
-								<input type="submit" value="{$lng['aps']['install']}" />
-							</td>
-						</tr>
-					</table>
-
-					<p style="display: none;">
-						<input type="hidden" name="s" value="$s" />
-						<input type="hidden" name="page" value="$page" />
-						<input type="hidden" name="action" value="install" />
-						<input type="hidden" name="withinput" value="withinput" />
-						<input type="hidden" name="id" value="{$Row['ID']}" />
-					</p>
-				</fieldset>
-			</form>
-	</section>
-</article>
diff --git a/templates/Froxlor/customer/aps/package.tpl b/templates/Froxlor/customer/aps/package.tpl
deleted file mode 100644
index b959e67a..00000000
--- a/templates/Froxlor/customer/aps/package.tpl
+++ /dev/null
@@ -1,68 +0,0 @@
-<article>
-	<header>
-		<h2>
-			<img src="templates/{$theme}/assets/img/icons/aps.png" alt="{$Xml->name}" />&nbsp;
-			{$Xml->name}
-		</h2>
-	</header>
-	
-	<section class="fullform bradiusodd">
-
-				<fieldset>
-					<legend>Froxlor&nbsp;-&nbsp;</legend>
-
-					<table class="formtable">
-						<tr>
-							<td colspan="2"><strong>$Summary</strong></td>
-							<td style="text-align: center; padding: 10px; background-color:#FFFFFF;"><img src="{$Icon}" alt="{$Xml->name} Icon"/></td>
-						</tr>
-						<tr>
-							<td colspan="3"><strong>{$lng['aps']['data']}</strong></td>
-						</tr>
-						$Data
-						<tr>
-							<td colspan="3">
-							<if $action == 'overview' || $action == 'search'>
-								<form method="get" action="$filename" style="float:left;">
-									<input type="hidden" name="s" value="$s" />
-									<input type="hidden" name="page" value="$page" />
-									<input type="hidden" name="action" value="details" />
-									<input type="hidden" name="id" value="{$Row['ID']}" />
-									<input class="bottom" type="submit" value="{$lng['aps']['detail']}" />
-								</form>
-							</if>
-							<if $action != 'overview' && $action !='search' && $action != 'customerstatus'>
-								<form method="get" action="$filename" style="float:left;">
-									<input type="hidden" name="s" value="$s" />
-									<input type="hidden" name="page" value="$page" />
-									<input type="hidden" name="action" value="overview" />
-									<input class="bottom" type="submit" value="{$lng['aps']['back']}" />
-								</form>
-							</if>
-							<if $action != 'customerstatus' && ( $userinfo['aps_packages'] != $userinfo['aps_packages_used'] ) && $db_info == ''>
-								<form method="get" action="$filename" style="float:left; padding-left: 5px;">
-									<input type="hidden" name="s" value="$s" />
-									<input type="hidden" name="page" value="$page" />
-									<input type="hidden" name="action" value="install" />
-									<input type="hidden" name="id" value="{$Row['ID']}" />
-									<input class="bottom" type="submit" value="{$lng['aps']['install']}" />
-								</form>
-							</if>
-							<if $db_info != ''>
-								<span style="padding-left: 5px;">{$db_info}</span>
-							</if>
-							<if ($action == 'customerstatus') && ($Row['Status'] == 2 || $Row['Status'] == 3)>
-								<form method="get" action="$filename" style="float:left;">
-									<input type="hidden" name="s" value="$s" />
-									<input type="hidden" name="page" value="$page" />
-									<input type="hidden" name="action" value="remove" />
-									<input type="hidden" name="id" value="{$Row['ID']}" />
-									<input class="bottom" type="submit" value="{$lng['aps']['uninstall']}" />
-								</form>
-							</if>
-							</td>
-						</tr>
-					</table>
-				</fieldset>
-	</section>
-</article>
diff --git a/templates/Froxlor/customer/aps/package_status.tpl b/templates/Froxlor/customer/aps/package_status.tpl
deleted file mode 100644
index d566b0d3..00000000
--- a/templates/Froxlor/customer/aps/package_status.tpl
+++ /dev/null
@@ -1,60 +0,0 @@
-<article>
-	<header>
-		<h2>
-			<img src="templates/{$theme}/assets/img/icons/aps.png" alt="{$Xml->name}" />&nbsp;
-			{$Xml->name}
-		</h2>
-	</header>
-	
-	<section class="fullform bradiusodd">
-
-				<fieldset>
-					<legend>Froxlor&nbsp;-&nbsp;</legend>
-
-					<table class="formtable">
-						<tr>
-							<td colspan="2"><strong>$Summary</strong></td>
-							<td style="text-align: center; padding: 10px; background-color:#FFFFFF;"><img src="{$Icon}" alt="{$Xml->name} Icon"/></td>
-						</tr>
-						<tr>
-							<td colspan="3"><strong>{$lng['aps']['data']}</strong></td>
-						</tr>
-						$Data
-						<tr>
-							<td colspan="3">
-								<if $Row['Status'] == INSTANCE_INSTALL>
-									<form method="get" action="$filename" >
-										<input type="hidden" name="s" value="$s" />
-										<input type="hidden" name="page" value="$page" />
-										<input type="hidden" name="action" value="stopinstall" />
-										<input type="hidden" name="id" value="{$Row['ID']}" />
-										<input class="bottom" type="submit" value="{$lng['aps']['stopinstall']}" />
-									</form>
-								</if>
-								<if $Row['Status'] == INSTANCE_SUCCESS || $Row['Status'] == INSTANCE_ERROR>
-									<form method="get" action="$filename" style="float:left;">
-										<input type="hidden" name="s" value="$s" />
-										<input type="hidden" name="page" value="$page" />
-										<input type="hidden" name="action" value="remove" />
-										<input type="hidden" name="id" value="{$Row['ID']}" />
-										<input class="bottom" type="submit" value="{$lng['aps']['uninstall']}" />
-									</form>
-								</if>
-								<if $Row['Status'] == INSTANCE_SUCCESS && false == true>
-									<form method="get" action="$filename" style="float:left; padding-left: 5px;">
-										<input type="hidden" name="s" value="$s" />
-										<input type="hidden" name="page" value="$page" />
-										<input type="hidden" name="action" value="reconfigure" />
-										<input type="hidden" name="id" value="{$Row['ID']}" />
-										<input class="bottom" type="submit" value="{$lng['aps']['reconfigure']}" />
-									</form>
-								</if>
-								<if $Row['Status'] == INSTANCE_TASK_ACTIVE || $Row['Status'] == INSTANCE_UNINSTALL>
-									{$lng['aps']['waitfortask']}
-								</if>
-							</td>
-						</tr>
-					</table>
-				</fieldset>
-	</section>
-</article>
diff --git a/templates/Froxlor/customer/aps/search.tpl b/templates/Froxlor/customer/aps/search.tpl
deleted file mode 100644
index d24ddc2b..00000000
--- a/templates/Froxlor/customer/aps/search.tpl
+++ /dev/null
@@ -1,34 +0,0 @@
-<article>
-	<header>
-		<h2>
-			<img src="templates/{$theme}/assets/img/icons/aps.png" alt=""{$lng['aps']['search']} />&nbsp;
-			{$lng['aps']['search']}
-		</h2>
-	</header>
-	
-	<section class="fullform bradiusodd">
-
-			<form action="$filename" method="get" enctype="application/x-www-form-urlencoded">
-				<fieldset>
-					<legend>Froxlor&nbsp;-&nbsp;{$lng['aps']['search']}</legend>
-
-					<table class="formtable">
-						<tr>
-							<td>{$lng['aps']['search_description']}</td>
-							<td><input type="text" name="keyword" class="text" value="$Keyword"/></td>
-						</tr>
-						<tr>
-							<td style="text-align: right;" colspan="2"><input  type="submit" value="{$lng['aps']['search']}" /></td>
-						</tr>
-					</table>
-
-					<p style="display: none;">
-						<input type="hidden" name="s" value="$s" />
-						<input type="hidden" name="page" value="$page" />
-						<input type="hidden" name="action" value="$action" />
-						<input type="hidden" name="send" value="send" />
-					</p>
-				</fieldset>
-			</form>
-	</section>
-</article>
diff --git a/templates/Froxlor/customer/index/index.tpl b/templates/Froxlor/customer/index/index.tpl
index 9e62aa81..56c7e208 100644
--- a/templates/Froxlor/customer/index/index.tpl
+++ b/templates/Froxlor/customer/index/index.tpl
@@ -58,12 +58,6 @@ $header
 		</tr>
 		</if>
 		</tr>
-		<if $settings['autoresponder']['autoresponder_active'] == 1>
-		<tr>
-			<td>{$lng['customer']['autoresponder']} ({$lng['customer']['usedmax']}):</td>
-			<td>{$userinfo['email_autoresponder_used']}/{$userinfo['email_autoresponder']}</td>
-		</tr>
-		</if>
 		<tr>
 			<td>{$lng['customer']['mysqls']} ({$lng['customer']['usedmax']}):</td>
 			<td>{$userinfo['mysqls_used']}/{$userinfo['mysqls']}</td>
@@ -72,12 +66,6 @@ $header
 			<td>{$lng['customer']['ftps']} ({$lng['customer']['usedmax']}):</td>
 			<td>{$userinfo['ftps_used']}/{$userinfo['ftps']}</td>
 		</tr>
-		<if (int)$settings['aps']['aps_active'] == 1>
-		<tr>
-			<td>{$lng['aps']['numberofapspackages']} ({$lng['customer']['usedmax']}):</td>
-			<td>{$userinfo['aps_packages_used']}/{$userinfo['aps_packages']}</td>
-		</tr>
-		</if>
 		<if $settings['ticket']['enabled'] == 1 >
 		<tr>
 			<td>{$lng['customer']['tickets']} ({$lng['customer']['usedmax']}):</td>
diff --git a/templates/Froxlor/customer/mysql/mysqls_database.tpl b/templates/Froxlor/customer/mysql/mysqls_database.tpl
index 406f3778..7d0cdb64 100644
--- a/templates/Froxlor/customer/mysql/mysqls_database.tpl
+++ b/templates/Froxlor/customer/mysql/mysqls_database.tpl
@@ -3,16 +3,12 @@
 	<td>{$row['description']}</td>
 	<td>{$row['size']}</td>
 	<if 1 < $count_mysqlservers><td>{$sql_root['caption']}</td></if>
-	<if $row['apsdb'] != '1'>
-		<td>
-			<a href="{$linker->getLink(array('section' => 'mysql', 'page' => 'mysqls', 'action' => 'edit', 'id' => $row['id']))}" style="text-decoration:none;">
-				<img src="templates/{$theme}/assets/img/icons/edit.png" alt="{$lng['panel']['edit']}" />
-			</a>&nbsp;
-			<a href="{$linker->getLink(array('section' => 'mysql', 'page' => 'mysqls', 'action' => 'delete', 'id' => $row['id']))}" style="text-decoration:none;">
-				<img src="templates/{$theme}/assets/img/icons/delete.png" alt="{$lng['panel']['delete']}" />
-			</a>
-		</td>
-	<else>
-		<td>{$lng['aps']['cannoteditordeleteapsdb']}</td>
-	</if>
+	<td>
+		<a href="{$linker->getLink(array('section' => 'mysql', 'page' => 'mysqls', 'action' => 'edit', 'id' => $row['id']))}" style="text-decoration:none;">
+			<img src="templates/{$theme}/assets/img/icons/edit.png" alt="{$lng['panel']['edit']}" />
+		</a>&nbsp;
+		<a href="{$linker->getLink(array('section' => 'mysql', 'page' => 'mysqls', 'action' => 'delete', 'id' => $row['id']))}" style="text-decoration:none;">
+			<img src="templates/{$theme}/assets/img/icons/delete.png" alt="{$lng['panel']['delete']}" />
+		</a>
+	</td>
 </tr>
diff --git a/templates/Sparkle/admin/aps/askyesno.tpl b/templates/Sparkle/admin/aps/askyesno.tpl
deleted file mode 100644
index e8002ffb..00000000
--- a/templates/Sparkle/admin/aps/askyesno.tpl
+++ /dev/null
@@ -1,24 +0,0 @@
-<div class="messagewrapper">
-	<div class="warningcontainer bradius">
-		<div class="warningtitle">{$lng['question']['question']}</div>
-		<div class="warning">
-			$Message
-			<div style="text-align:right;">
-				<form name="continue" action="$filename" method="post">
-					<input type="submit" name="answer" value="{$lng['panel']['yes']}" />
-					<input type="hidden" name="save" value="1"/>
-					<input type="hidden" name="s" value="$s"/>
-					<input type="hidden" name="action" value="$action"/>
-					$Ids
-				</form>
-				&nbsp;
-				<form name="back" action="$filename" method="post">
-					<input type="submit" class="nobutton" name="submit" value="{$lng['panel']['no']}" />
-					<input type="hidden" name="action" value="$action"/>
-					<input type="hidden" name="s" value="$s"/>
-				</form>
-			</div>
-		</div>
-		</div>
-	</form>
-</div>
diff --git a/templates/Sparkle/admin/aps/footer.tpl b/templates/Sparkle/admin/aps/footer.tpl
deleted file mode 100644
index 35ee6c15..00000000
--- a/templates/Sparkle/admin/aps/footer.tpl
+++ /dev/null
@@ -1 +0,0 @@
-$footer
diff --git a/templates/Sparkle/admin/aps/header.tpl b/templates/Sparkle/admin/aps/header.tpl
deleted file mode 100644
index 6af88b30..00000000
--- a/templates/Sparkle/admin/aps/header.tpl
+++ /dev/null
@@ -1 +0,0 @@
-$header
diff --git a/templates/Sparkle/admin/aps/infobox.tpl b/templates/Sparkle/admin/aps/infobox.tpl
deleted file mode 100644
index d99e5788..00000000
--- a/templates/Sparkle/admin/aps/infobox.tpl
+++ /dev/null
@@ -1,24 +0,0 @@
-<if $Type == 0>
-<div class="warningcontainer bradius">
-	<div class="warningtitle">{$lng['success']['success']}</div>
-	<div class="warning">
-		$Message
-	</div>
-</div>
-</if>
-<if $Type == 1>
-<div class="errorcontainer bradius">
-	<div class="errortitle">{$lng['error']['error']}</div>
-	<div class="error">
-		$Message
-	</div>
-</div>
-</if>
-<if $Type == 2>
-<div class="successcontainer bradius">
-	<div class="successtitle">{$lng['success']['success']}</div>
-	<div class="success">
-		$Message
-	</div>
-</div>
-</if>
diff --git a/templates/Sparkle/admin/aps/manage_instances.tpl b/templates/Sparkle/admin/aps/manage_instances.tpl
deleted file mode 100644
index ee3215da..00000000
--- a/templates/Sparkle/admin/aps/manage_instances.tpl
+++ /dev/null
@@ -1,58 +0,0 @@
-<article>
-		<header>
-			<h2>
-				<img src="templates/{$theme}/assets/img/icons/aps_big.png" alt="" />&nbsp;
-				{$lng['aps']['specialoptions']}
-			</h2>
-		</header>
-		
-		<section class="fullform bradius">
-	        	<table class="formtable">
-						<tr>
-							<td><strong>{$lng['aps']['statistics']}</strong></td>
-							<td>$Statistics</td>
-						</tr>
-				</table>
-		</fieldset>
-		<br /><br />
-		</section>
-</article>
-<br /><br />
-<article>
-		<header>
-			<h2>
-				<img src="templates/{$theme}/assets/img/icons/aps_big.png" alt="" />&nbsp;
-				{$lng['aps']['manageinstances']}
-			</h2>
-		</header>
-		
-		<section class="fullform bradius">
-		<form action="$filename" method="post" enctype="application/x-www-form-urlencoded">
-				<fieldset>
-					<legend>Froxlor&nbsp;-&nbsp;{$lng['aps']['manageinstances']}</legend>
-					
-	        	<table class="formtable">
-				<thead>
-					<tr>
-						<th style="text-align:center;">{$lng['aps']['packagenameandstatus']}</th>
-						<th style="text-align:center;">{$lng['aps']['stopinstall']}</th>
-						<th style="text-align:center;">{$lng['aps']['uninstall']}</th>
-					</tr>
-				</thead>
-				<tbody>
-						{$Instances}
-						<td colspan="3"><input class="bottom" type="reset" value="{$lng['panel']['reset']}" />&nbsp;<input type="submit" name="save" value="{$lng['panel']['save']}" /></td>
-					</tr>
-				</tbody>
-				</table>
-				<p style="display: none;">
-					<input type="hidden" name="s" value="$s" />
-					<input type="hidden" name="page" value="$page" />
-					<input type="hidden" name="action" value="$action" />
-					<input type="hidden" name="send" value="send" />
-				</p>
-		</fieldset>
-		</form>
-		<br /><br />
-		</section>
-</article>
diff --git a/templates/Sparkle/admin/aps/manage_instances_detail.tpl b/templates/Sparkle/admin/aps/manage_instances_detail.tpl
deleted file mode 100644
index e085df7b..00000000
--- a/templates/Sparkle/admin/aps/manage_instances_detail.tpl
+++ /dev/null
@@ -1,5 +0,0 @@
-<tr>
-	<td  class="field_name_border_left" style="padding-left: 2em;">{$Row['name']}, {$Row['firstname']} <if $Row['company'] != ''> | {$Row['company']}</if> ({$Row['loginname']}): {$database}; {$main_domain}</td>
-	<td class="field_name" style="text-align:center;"><if isset($Stop) == true>$Stop</if></td>
-	<td class="field_name" style="text-align:center;"><if isset($Remove) == true>$Remove</if></td>
-</tr>
diff --git a/templates/Sparkle/admin/aps/manage_instances_package.tpl b/templates/Sparkle/admin/aps/manage_instances_package.tpl
deleted file mode 100644
index f2e4e06e..00000000
--- a/templates/Sparkle/admin/aps/manage_instances_package.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-<tr>
-	<td  class="field_display_border_left" colspan="3"><strong>{$Row['Name']} {$Row['Version']} (Release {$Row['Release']})</strong></td>
-</tr>
\ No newline at end of file
diff --git a/templates/Sparkle/admin/aps/manage_instances_status.tpl b/templates/Sparkle/admin/aps/manage_instances_status.tpl
deleted file mode 100644
index 9e0e3822..00000000
--- a/templates/Sparkle/admin/aps/manage_instances_status.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-<tr>
-	<td  class="title" colspan="3" style="font-size: 1.1em;"><strong>{$Caption}</strong></td>
-</tr>
diff --git a/templates/Sparkle/admin/aps/manage_packages.tpl b/templates/Sparkle/admin/aps/manage_packages.tpl
deleted file mode 100644
index 512b472a..00000000
--- a/templates/Sparkle/admin/aps/manage_packages.tpl
+++ /dev/null
@@ -1,110 +0,0 @@
-<article>
-	<header>
-		<h2>
-			<img src="templates/{$theme}/assets/img/icons/aps_big.png" alt="" />&nbsp;
-			{$lng['aps']['specialoptions']}
-		</h2>
-	</header>
-
-	<section class="midform midformaps_2 bradius">
-	
-		<form action="$filename" method="post" enctype="application/x-www-form-urlencoded">
-			<p style="margin-left:10px;">
-				<strong>{$lng['admin']['phpsettings']['actions']}</strong>
-			</p>
-			<p style="margin-left:10px;">
-				<input type="hidden" name="s" value="$s" />
-				<input type="hidden" name="action" value="$action" />
-				<input type="hidden" name="page" value="$page" />
-				<input type="hidden" name="save" value="save" />
-				<input type="submit" name="downloadallpackages" value="{$lng['aps']['downloadallpackages']}" />
-			</p>
-		</form>
-
-		<form action="$filename" method="post" enctype="application/x-www-form-urlencoded">
-			<p style="margin-left:10px;">
-				<input type="hidden" name="s" value="$s" />
-				<input type="hidden" name="action" value="$action" />
-				<input type="hidden" name="page" value="$page" />
-				<input type="hidden" name="save" value="save" />
-				<input type="submit" name="updateallpackages" value="{$lng['aps']['updateallpackages']}" />
-			</p>
-		</form>
-
-		<form action="$filename" method="post" enctype="application/x-www-form-urlencoded">
-			<p style="margin-left:10px;">
-				<input type="hidden" name="s" value="$s" />
-				<input type="hidden" name="action" value="$action" />
-				<input type="hidden" name="page" value="$page" />
-				<input type="hidden" name="save" value="save" />
-				<input type="submit" name="enablenewest" value="{$lng['aps']['enablenewest']}" />
-			</p>
-		</form>
-
-		<form action="$filename" method="post" enctype="application/x-www-form-urlencoded">
-			<p style="margin-left:10px;">
-				<input type="hidden" name="s" value="$s" />
-				<input type="hidden" name="action" value="$action" />
-				<input type="hidden" name="page" value="$page" />
-				<input type="hidden" name="save" value="save" />
-				<input type="submit" name="removeunused" value="{$lng['aps']['removeunused']}" />
-			</p>
-		</form>
-
-	</section>
-	<br />
-	<section class="midform bradius">
-		<p style="margin-left:10px;"><strong>{$lng['aps']['statistics']}</strong></p>
-		<p style="margin-left:10px;">{$Statistics}</p>
-	</section>
-</article>
-<br />
-<article>
-	<header>
-		<h2>
-			<img src="templates/{$theme}/assets/img/icons/aps_big.png" alt="" />&nbsp;
-			{$lng['aps']['managepackages']}
-		</h2>
-	</header>
-
-	<section>
-	
-		<form action="$filename" method="post" enctype="application/x-www-form-urlencoded">
-
-			<table class="bradius aps">
-			<thead>
-				<tr>
-					<th style="width:30%;">{$lng['aps']['packagenameandversion']}</th>
-					<th>{$lng['ticket']['status']}</th>
-					<th>{$lng['aps']['installations']}</th>
-					<th style="width:7%;">{$lng['aps']['lock']}</th>
-					<th style="width:7%;">{$lng['aps']['unlock']}</th>
-					<th style="width:7%;">{$lng['aps']['remove']}</th>
-				</tr>
-			</thead>
-			<tfoot>
-				<tr>
-					<td colspan="3" style="border-top:1px solid #666;"><strong>{$lng['aps']['allpackages']}</strong></td>
-					<td style="width:7%;text-align:center;border-top:1px solid #666;"><input type="radio" name="all" value="lock"/></td>
-					<td style="width:7%;text-align:center;border-top:1px solid #666;"><input type="radio" name="all" value="unlock"/></td>
-					<td style="width:7%;text-align:center;border-top:1px solid #666;"><input type="radio" name="all" value="remove"/></td>
-				</tr>
-			</tfoot>
-			<tbody>
-				{$Packages}
-			</tbody>
-			</table>
-
-			<p class="submit">
-				<input type="hidden" name="s" value="$s" />
-				<input type="hidden" name="action" value="$action" />
-				<input type="hidden" name="page" value="$page" />
-				<input type="reset" value="{$lng['panel']['reset']}"/>&nbsp;
-				<input type="submit" name="save" value="{$lng['panel']['save']}"/>
-			</p>
-
-		</form>
-	</section>
-
-</article>
-
diff --git a/templates/Sparkle/admin/aps/manage_packages_detail.tpl b/templates/Sparkle/admin/aps/manage_packages_detail.tpl
deleted file mode 100644
index 719f1a34..00000000
--- a/templates/Sparkle/admin/aps/manage_packages_detail.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-<tr>
-	<td>{$Row2['Version']} (Release {$Row2['Release']})</td>
-	<td><if $Row2['Status'] == PACKAGE_LOCKED>{$lng['aps']['package_locked']}</if><if $Row2['Status'] == PACKAGE_ENABLED>{$lng['aps']['package_enabled']}</if></td>
-	<td>{$Installations}</td>
-	<td style="text-align:center;">$Lock</td>
-	<td style="text-align:center;">$Unlock</td>
-	<td style="text-align:center;"><if $Installations == 0>$Remove</if></td>
-</tr>
diff --git a/templates/Sparkle/admin/aps/manage_packages_download.tpl b/templates/Sparkle/admin/aps/manage_packages_download.tpl
deleted file mode 100644
index f20eed37..00000000
--- a/templates/Sparkle/admin/aps/manage_packages_download.tpl
+++ /dev/null
@@ -1,30 +0,0 @@
-<article>
-	<header>
-		<h2>
-			<img src="templates/{$theme}/assets/img/icons/aps_big.png" alt="" />&nbsp;
-			{$lng['aps']['specialoptions']}
-		</h2>
-	</header>
-
-	<section class="midform midformaps_2 bradius">
-	
-		<form action="$filename" method="post" enctype="application/x-www-form-urlencoded">
-			<fieldset>
-			<legend>Froxlor&nbsp;-&nbsp;{$lng['aps']['specialoptions']}</legend>
-			<p>
-				<strong>{$lng['admin']['phpsettings']['actions']}</strong>
-			</p>
-			<p class="submit">
-				<input type="hidden" name="s" value="$s" />
-				<input type="hidden" name="action" value="$action" />
-				<input type="hidden" name="page" value="$page" />
-				<input type="hidden" name="save" value="save" />
-				<input type="submit" name="downloadallpackages" value="{$lng['aps']['downloadallpackages']}" />
-			</p>
-			</fieldset>
-		</form>
-
-	</section>
-
-</article>
-
diff --git a/templates/Sparkle/admin/aps/manage_packages_row.tpl b/templates/Sparkle/admin/aps/manage_packages_row.tpl
deleted file mode 100644
index 4b658828..00000000
--- a/templates/Sparkle/admin/aps/manage_packages_row.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-<tr>
-	<td colspan="6" style="border-top: 1px solid #666;border-bottom:1px solid #666;"><strong>{$Row['Name']}</strong></td>
-</tr>
diff --git a/templates/Sparkle/admin/aps/upload.tpl b/templates/Sparkle/admin/aps/upload.tpl
deleted file mode 100644
index a07e5564..00000000
--- a/templates/Sparkle/admin/aps/upload.tpl
+++ /dev/null
@@ -1,29 +0,0 @@
-<article>
-	<header>
-		<h2>
-			<img src="templates/{$theme}/assets/img/icons/aps_upload_big.png" alt="" />&nbsp;
-			{$lng['aps']['upload']}
-		</h2>
-	</header>
-
-	<section class="midform midformaps_1 bradius">
-	
-		<form action="$filename" method="post" enctype="multipart/form-data">
-			<fieldset>
-				<legend>Froxlor&nbsp;-&nbsp;{$lng['aps']['upload']}</legend>
-				<p>
-					<strong>{$lng['aps']['upload_description']}</strong><br />
-					<a href="http://www.apsstandard.org/" rel="external">http://www.apsstandard.org/</a>
-				</p>
-				{$Output}
-
-				<input type="hidden" name="s" value="$s" />
-				<input type="hidden" name="page" value="$page" />
-				<input type="hidden" name="action" value="$action" />
-				<input type="submit" value="{$lng['aps']['upload']}" />
-			</fieldset>
-		</form>
-	</section>
-
-</article>
-
diff --git a/templates/Sparkle/admin/index/index.tpl b/templates/Sparkle/admin/index/index.tpl
index 36e0e4ff..6ae3fae4 100644
--- a/templates/Sparkle/admin/index/index.tpl
+++ b/templates/Sparkle/admin/index/index.tpl
@@ -135,36 +135,6 @@ $header
 			</div>
 			</if>
 			
-			<if $settings['autoresponder']['autoresponder_active'] == 1>
-			<div class="canvasbox">
-				<input type="hidden" id="email_autoresponder" class="circular" data-used="{$overview['email_autoresponder_used']}" data-available="{$userinfo['email_autoresponder']}" data-assigned="{$userinfo['email_autoresponder_used']}">
-				<canvas id="email_autoresponder-canvas" width="120" height="76"></canvas><br/>
-				{$lng['customer']['autoresponder']}<br />
-				<small>
-					{$overview['email_autoresponder_used']} {$lng['panel']['used']}<br />
-					{$userinfo['email_autoresponder_used']} {$lng['panel']['assigned']}<br />
-					<if $userinfo['email_autoresponder'] != '∞'>
-					{$userinfo['email_autoresponder']} {$lng['panel']['available']}
-					</if>
-				</small>
-			</div>
-			</if>
-			
-			<if (int)$settings['aps']['aps_active'] == 1>
-			<div class="canvasbox">
-				<input type="hidden" id="aps_packages" class="circular" data-used="{$overview['aps_packages_used']}" data-available="{$userinfo['aps_packages']}" data-assigned="{$userinfo['aps_packages_used']}">
-				<canvas id="aps_packages-canvas" width="120" height="76"></canvas><br/>
-				{$lng['aps']['numberofapspackages']}<br />
-				<small>
-					{$overview['aps_packages_used']} {$lng['panel']['used']}<br />
-					{$userinfo['aps_packages_used']} {$lng['panel']['assigned']}<br />
-					<if $userinfo['aps_packages'] != '∞'>
-					{$userinfo['aps_packages']} {$lng['panel']['available']}
-					</if>
-				</small>
-			</div>
-			</if>
-			
 			<div class="canvasbox">
 				<input type="hidden" id="ftps" class="circular" data-used="{$overview['ftps_used']}" data-available="{$userinfo['ftps']}" data-assigned="{$userinfo['ftps_used']}">
 				<canvas id="ftps-canvas" width="120" height="76"></canvas><br/>
diff --git a/templates/Sparkle/admin/settings/updatecounters_row_admin.tpl b/templates/Sparkle/admin/settings/updatecounters_row_admin.tpl
index 851f8739..e0f2022f 100644
--- a/templates/Sparkle/admin/settings/updatecounters_row_admin.tpl
+++ b/templates/Sparkle/admin/settings/updatecounters_row_admin.tpl
@@ -47,12 +47,6 @@
 							<td><span <if $admin['email_quota_used'] == $admin['email_quota_used_new']>style="color:green"<else>style="color:red"</if>><b>{$admin['email_quota_used']} -&gt; {$admin['email_quota_used_new']}</b></span></td>
 						</tr>
 						</if>
-						<if $settings['autoresponder']['autoresponder_active'] == 1>
-						<tr>
-							<td>{$lng['customer']['autoresponder']}:</td>
-							<td><span <if $admin['email_autoresponder_used'] == $admin['email_autoresponder_used_new']>style="color:green"<else>style="color:red"</if>><b>{$admin['email_autoresponder_used']} -&gt; {$admin['email_autoresponder_used_new']}</b></span></td>
-						</tr>
-						</if>
 						<tr>
 							<td>{$lng['customer']['ftps']}:</td>
 							<td><span <if $admin['ftps_used'] == $admin['ftps_used_new']>style="color:green"<else>style="color:red"</if>><b>{$admin['ftps_used']} -&gt; {$admin['ftps_used_new']}</b></span></td>
@@ -63,12 +57,6 @@
 							<td><span <if $admin['tickets_used'] == $admin['tickets_used_new']>style="color:green"<else>style="color:red"</if>><b>{$admin['tickets_used']} -&gt; {$admin['tickets_used_new']}</b></span></td>
 						</tr>
 						</if>
-						<if $settings['aps']['aps_active'] == '1'>
-						<tr>
-							<td>{$lng['customer']['aps']}:</td>
-							<td><span <if $admin['aps_packages_used'] == $admin['aps_packages_used_new']>style="color:green"<else>style="color:red"</if>><b>{$admin['aps_packages_used']} -&gt; {$admin['aps_packages_used_new']}</b></span></td>
-						</tr>
-						</if>
 					</table>
 				</section>
 			</td>
diff --git a/templates/Sparkle/admin/settings/updatecounters_row_customer.tpl b/templates/Sparkle/admin/settings/updatecounters_row_customer.tpl
index 96a5f0c8..2eafe36d 100644
--- a/templates/Sparkle/admin/settings/updatecounters_row_customer.tpl
+++ b/templates/Sparkle/admin/settings/updatecounters_row_customer.tpl
@@ -31,12 +31,6 @@
 							<td><span <if $customer['email_quota_used'] == $customer['email_quota_used_new']>style="color:green"<else>style="color:red"</if>><b>{$customer['email_quota_used']} -&gt; {$customer['email_quota_used_new']}</b></span></td>
 						</tr>
 						</if>
-						<if $settings['autoresponder']['autoresponder_active'] == 1>
-						<tr>
-							<td>{$lng['customer']['autoresponder']}:</td>
-							<td><span <if $customer['email_autoresponder_used'] == $customer['email_autoresponder_used_new']>style="color:green"<else>style="color:red"</if>><b>{$customer['email_autoresponder_used']} -&gt; {$customer['email_autoresponder_used_new']}</b></span></td>
-						</tr>
-						</if>
 						<tr>
 							<td>{$lng['customer']['ftps']}:</td>
 							<td><span <if $customer['ftps_used'] == $customer['ftps_used_new']>style="color:green"<else>style="color:red"</if>><b>{$customer['ftps_used']} -&gt; {$customer['ftps_used_new']}</b></span></td>
@@ -47,12 +41,6 @@
 							<td><span <if $customer['tickets_used'] == $customer['tickets_used_new']>style="color:green"<else>style="color:red"</if>><b>{$customer['tickets_used']} -&gt; {$customer['tickets_used_new']}</b></span></td>
 						</tr>
 						</if>
-						<if $settings['aps']['aps_active'] == '1'>
-						<tr>
-							<td>{$lng['customer']['aps']}:</td>
-							<td><span <if $customer['aps_packages_used'] == $customer['aps_packages_used_new']>style="color:green"<else>style="color:red"</if>><b>{$customer['aps_packages_used']} -&gt; {$customer['aps_packages_used_new']}</b></span></td>
-						</tr>
-						</if>
 					</table>
 				</section>
 			</td>
diff --git a/templates/Sparkle/customer/aps/askyesno.tpl b/templates/Sparkle/customer/aps/askyesno.tpl
deleted file mode 100644
index d43b9b84..00000000
--- a/templates/Sparkle/customer/aps/askyesno.tpl
+++ /dev/null
@@ -1,25 +0,0 @@
-<div class="messagewrapper">
-	<div class="warningcontainer bradius">
-		<div class="warningtitle">{$lng['question']['question']}</div>
-		<div class="warning">
-			$Message
-			<div style="text-align:right;">
-				<form name="continue" action="$filename" method="post">
-					<input type="submit" name="answer" value="{$lng['panel']['yes']}" />
-					<input type="hidden" name="save" value="1"/>
-					<input type="hidden" name="s" value="$s"/>
-					<input type="hidden" name="action" value="$action"/>
-					$Ids
-				</form>
-				&nbsp;
-				<form name="back" action="$filename" method="post">
-					<input type="submit" name="submit" value="{$lng['panel']['no']}" />
-					<input type="hidden" name="action" value="<if isset($action_alt)>$action_alt<else>$action</if>"/>
-					<input type="hidden" name="s" value="$s"/>
-				</form>
-			</div>
-		</div>
-		</div>
-	</form>
-</div>
-
diff --git a/templates/Sparkle/customer/aps/data.tpl b/templates/Sparkle/customer/aps/data.tpl
deleted file mode 100644
index 06e76872..00000000
--- a/templates/Sparkle/customer/aps/data.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-<if $Groupname != ''>
-<tr>
-	<td class="title" colspan="3"><strong>$Groupname</strong></td>
-</tr>
-</if>
-<tr>
-	<td class="field_name_border_left" valign="top" width="25%">$Fieldname</td>
-	<td class="field_display" colspan="3">$Fieldvalue</td>
-</tr>
diff --git a/templates/Sparkle/customer/aps/footer.tpl b/templates/Sparkle/customer/aps/footer.tpl
deleted file mode 100644
index 35ee6c15..00000000
--- a/templates/Sparkle/customer/aps/footer.tpl
+++ /dev/null
@@ -1 +0,0 @@
-$footer
diff --git a/templates/Sparkle/customer/aps/header.tpl b/templates/Sparkle/customer/aps/header.tpl
deleted file mode 100644
index 6af88b30..00000000
--- a/templates/Sparkle/customer/aps/header.tpl
+++ /dev/null
@@ -1 +0,0 @@
-$header
diff --git a/templates/Sparkle/customer/aps/infobox.tpl b/templates/Sparkle/customer/aps/infobox.tpl
deleted file mode 100644
index b55608f7..00000000
--- a/templates/Sparkle/customer/aps/infobox.tpl
+++ /dev/null
@@ -1,25 +0,0 @@
-<if $Type == 0>
-<div class="warningcontainer bradius">
-        <div class="warningtitle">{$lng['success']['success']}</div>
-        <div class="warning">
-                $Message
-        </div>
-</div>
-</if>
-<if $Type == 1>
-<div class="errorcontainer bradius">
-        <div class="errortitle">{$lng['error']['error']}</div>
-        <div class="error">
-                $Message
-        </div>
-</div>
-</if>
-<if $Type == 2>
-<div class="successcontainer bradius">
-        <div class="successtitle">{$lng['success']['success']}</div>
-        <div class="success">
-                $Message
-        </div>
-</div>
-</if>
-
diff --git a/templates/Sparkle/customer/aps/installer.tpl b/templates/Sparkle/customer/aps/installer.tpl
deleted file mode 100644
index 21bcc03b..00000000
--- a/templates/Sparkle/customer/aps/installer.tpl
+++ /dev/null
@@ -1,42 +0,0 @@
-<article>
-	<header>
-		<h2>
-			<img src="templates/{$theme}/assets/img/icons/aps_big.png" alt="{$Xml->name}" />&nbsp;
-			{$Xml->name}
-		</h2>
-	</header>
-	
-	<section class="fullform bradius">
-
-			<form action="$filename" method="post" enctype="application/x-www-form-urlencoded">
-				<fieldset>
-					<legend>Froxlor&nbsp;-&nbsp;{$Xml->name}</legend>
-
-					<table class="formtable">
-						<tr>
-							<td colspan="2"><strong>{$lng['aps']['install_wizard']}</strong>
-							<if $ErrorMessage != 0>
-								<div class="dataerror">{$lng['aps']['wizard_error']}</div>
-							</if>
-							</td>
-							<td style="text-align: center; padding: 10px; background-color:#FFFFFF;"><img src="{$Icon}" alt="{$Xml->name} Icon"/></td>
-						</tr>
-						$Data
-						<tr>
-							<td colspan="3">
-								<input type="submit" value="{$lng['aps']['install']}" />
-							</td>
-						</tr>
-					</table>
-
-					<p style="display: none;">
-						<input type="hidden" name="s" value="$s" />
-						<input type="hidden" name="page" value="$page" />
-						<input type="hidden" name="action" value="install" />
-						<input type="hidden" name="withinput" value="withinput" />
-						<input type="hidden" name="id" value="{$Row['ID']}" />
-					</p>
-				</fieldset>
-			</form>
-	</section>
-</article>
diff --git a/templates/Sparkle/customer/aps/package.tpl b/templates/Sparkle/customer/aps/package.tpl
deleted file mode 100644
index 7aada2b8..00000000
--- a/templates/Sparkle/customer/aps/package.tpl
+++ /dev/null
@@ -1,68 +0,0 @@
-<article>
-	<header>
-		<h2>
-			<img src="templates/{$theme}/assets/img/icons/aps_big.png" alt="{$Xml->name}" />&nbsp;
-			{$Xml->name}
-		</h2>
-	</header>
-	
-	<section class="fullform bradius">
-
-				<fieldset>
-					<legend>Froxlor&nbsp;-&nbsp;</legend>
-
-					<table class="formtable">
-						<tr>
-							<td colspan="2"><strong>$Summary</strong></td>
-							<td style="text-align: center; padding: 10px; background-color:#FFFFFF;"><img src="{$Icon}" alt="{$Xml->name} Icon"/></td>
-						</tr>
-						<tr>
-							<td colspan="3"><strong>{$lng['aps']['data']}</strong></td>
-						</tr>
-						$Data
-						<tr>
-							<td colspan="3">
-							<if $action == 'overview' || $action == 'search'>
-								<form method="get" action="$filename" style="float:left;">
-									<input type="hidden" name="s" value="$s" />
-									<input type="hidden" name="page" value="$page" />
-									<input type="hidden" name="action" value="details" />
-									<input type="hidden" name="id" value="{$Row['ID']}" />
-									<input class="bottom" type="submit" value="{$lng['aps']['detail']}" />
-								</form>
-							</if>
-							<if $action != 'overview' && $action !='search' && $action != 'customerstatus'>
-								<form method="get" action="$filename" style="float:left;">
-									<input type="hidden" name="s" value="$s" />
-									<input type="hidden" name="page" value="$page" />
-									<input type="hidden" name="action" value="overview" />
-									<input class="bottom" type="submit" value="{$lng['aps']['back']}" />
-								</form>
-							</if>
-							<if $action != 'customerstatus' && ( $userinfo['aps_packages'] != $userinfo['aps_packages_used'] ) && $db_info == ''>
-								<form method="get" action="$filename" style="float:left; padding-left: 5px;">
-									<input type="hidden" name="s" value="$s" />
-									<input type="hidden" name="page" value="$page" />
-									<input type="hidden" name="action" value="install" />
-									<input type="hidden" name="id" value="{$Row['ID']}" />
-									<input class="bottom" type="submit" value="{$lng['aps']['install']}" />
-								</form>
-							</if>
-							<if $db_info != ''>
-								<span style="padding-left: 5px;">{$db_info}</span>
-							</if>
-							<if ($action == 'customerstatus') && ($Row['Status'] == 2 || $Row['Status'] == 3)>
-								<form method="get" action="$filename" style="float:left;">
-									<input type="hidden" name="s" value="$s" />
-									<input type="hidden" name="page" value="$page" />
-									<input type="hidden" name="action" value="remove" />
-									<input type="hidden" name="id" value="{$Row['ID']}" />
-									<input class="bottom" type="submit" value="{$lng['aps']['uninstall']}" />
-								</form>
-							</if>
-							</td>
-						</tr>
-					</table>
-				</fieldset>
-	</section>
-</article>
diff --git a/templates/Sparkle/customer/aps/package_status.tpl b/templates/Sparkle/customer/aps/package_status.tpl
deleted file mode 100644
index 9979c274..00000000
--- a/templates/Sparkle/customer/aps/package_status.tpl
+++ /dev/null
@@ -1,60 +0,0 @@
-<article>
-	<header>
-		<h2>
-			<img src="templates/{$theme}/assets/img/icons/aps_big.png" alt="{$Xml->name}" />&nbsp;
-			{$Xml->name}
-		</h2>
-	</header>
-	
-	<section class="fullform bradius">
-
-				<fieldset>
-					<legend>Froxlor&nbsp;-&nbsp;</legend>
-
-					<table class="formtable">
-						<tr>
-							<td colspan="2"><strong>$Summary</strong></td>
-							<td style="text-align: center; padding: 10px; background-color:#FFFFFF;"><img src="{$Icon}" alt="{$Xml->name} Icon"/></td>
-						</tr>
-						<tr>
-							<td colspan="3"><strong>{$lng['aps']['data']}</strong></td>
-						</tr>
-						$Data
-						<tr>
-							<td colspan="3">
-								<if $Row['Status'] == INSTANCE_INSTALL>
-									<form method="get" action="$filename" >
-										<input type="hidden" name="s" value="$s" />
-										<input type="hidden" name="page" value="$page" />
-										<input type="hidden" name="action" value="stopinstall" />
-										<input type="hidden" name="id" value="{$Row['ID']}" />
-										<input class="bottom" type="submit" value="{$lng['aps']['stopinstall']}" />
-									</form>
-								</if>
-								<if $Row['Status'] == INSTANCE_SUCCESS || $Row['Status'] == INSTANCE_ERROR>
-									<form method="get" action="$filename" style="float:left;">
-										<input type="hidden" name="s" value="$s" />
-										<input type="hidden" name="page" value="$page" />
-										<input type="hidden" name="action" value="remove" />
-										<input type="hidden" name="id" value="{$Row['ID']}" />
-										<input class="bottom" type="submit" value="{$lng['aps']['uninstall']}" />
-									</form>
-								</if>
-								<if $Row['Status'] == INSTANCE_SUCCESS && false == true>
-									<form method="get" action="$filename" style="float:left; padding-left: 5px;">
-										<input type="hidden" name="s" value="$s" />
-										<input type="hidden" name="page" value="$page" />
-										<input type="hidden" name="action" value="reconfigure" />
-										<input type="hidden" name="id" value="{$Row['ID']}" />
-										<input class="bottom" type="submit" value="{$lng['aps']['reconfigure']}" />
-									</form>
-								</if>
-								<if $Row['Status'] == INSTANCE_TASK_ACTIVE || $Row['Status'] == INSTANCE_UNINSTALL>
-									{$lng['aps']['waitfortask']}
-								</if>
-							</td>
-						</tr>
-					</table>
-				</fieldset>
-	</section>
-</article>
diff --git a/templates/Sparkle/customer/aps/search.tpl b/templates/Sparkle/customer/aps/search.tpl
deleted file mode 100644
index dee840fb..00000000
--- a/templates/Sparkle/customer/aps/search.tpl
+++ /dev/null
@@ -1,34 +0,0 @@
-<article>
-	<header>
-		<h2>
-			<img src="templates/{$theme}/assets/img/icons/aps_big.png" alt=""{$lng['aps']['search']} />&nbsp;
-			{$lng['aps']['search']}
-		</h2>
-	</header>
-	
-	<section class="fullform bradius">
-
-			<form action="$filename" method="get" enctype="application/x-www-form-urlencoded">
-				<fieldset>
-					<legend>Froxlor&nbsp;-&nbsp;{$lng['aps']['search']}</legend>
-
-					<table class="formtable">
-						<tr>
-							<td>{$lng['aps']['search_description']}</td>
-							<td><input type="text" name="keyword" class="text" value="$Keyword"/></td>
-						</tr>
-						<tr>
-							<td style="text-align: right;" colspan="2"><input  type="submit" value="{$lng['aps']['search']}" /></td>
-						</tr>
-					</table>
-
-					<p style="display: none;">
-						<input type="hidden" name="s" value="$s" />
-						<input type="hidden" name="page" value="$page" />
-						<input type="hidden" name="action" value="$action" />
-						<input type="hidden" name="send" value="send" />
-					</p>
-				</fieldset>
-			</form>
-	</section>
-</article>
diff --git a/templates/Sparkle/customer/index/index.tpl b/templates/Sparkle/customer/index/index.tpl
index c1f053db..5f1d433e 100644
--- a/templates/Sparkle/customer/index/index.tpl
+++ b/templates/Sparkle/customer/index/index.tpl
@@ -104,20 +104,6 @@ $header
 		</div>
 		</if>
 		
-		<if $settings['autoresponder']['autoresponder_active'] == 1 && $userinfo['email_autoresponder'] != '0'>
-		<div class="canvasbox">
-			<input type="hidden" id="email_autoresponder" class="circular" data-used="{$userinfo['email_autoresponder_used']}" data-available="{$userinfo['email_autoresponder']}">
-			<canvas id="email_autoresponder-canvas" width="120" height="76"></canvas><br />
-			{$lng['customer']['autoresponder']}<br />
-			<small>
-				{$userinfo['email_autoresponder_used']} {$lng['panel']['used']}<br />
-				<if $userinfo['email_autoresponder'] != '∞'>
-				{$userinfo['email_autoresponder']} {$lng['panel']['available']}
-				</if>
-			</small>
-		</div>
-		</if>
-
 		<if $userinfo['mysqls'] != '0'>
 		<div class="canvasbox">
 			<input type="hidden" id="mysqls" class="circular" data-used="{$userinfo['mysqls_used']}" data-available="{$userinfo['mysqls']}">
@@ -146,20 +132,6 @@ $header
 		</div>
 		</if>
 		
-		<if (int)$settings['aps']['aps_active'] == 1 && $userinfo['aps_packages'] != '0'>
-		<div class="canvasbox">
-			<input type="hidden" id="aps_packages" class="circular" data-used="{$userinfo['aps_packages_used']}" data-available="{$userinfo['aps_packages']}">
-			<canvas id="aps_packages-canvas" width="120" height="76"></canvas><br />
-			{$lng['aps']['numberofapspackages']}<br />
-			<small>
-				{$userinfo['aps_packages_used']} {$lng['panel']['used']}<br />
-				<if $userinfo['aps_packages'] != '∞'>
-				{$userinfo['aps_packages']} {$lng['panel']['available']}
-				</if>
-			</small>
-		</div>
-		</if>
-		
 		<if (int)$settings['ticket']['enabled'] == 1 && $userinfo['tickets'] != '0'>
 		<div class="canvasbox">
 			<input type="hidden" id="tickets" class="circular" data-used="{$userinfo['tickets_used']}" data-available="{$userinfo['tickets']}">
diff --git a/templates/Sparkle/customer/mysql/mysqls_database.tpl b/templates/Sparkle/customer/mysql/mysqls_database.tpl
index 406f3778..7d0cdb64 100644
--- a/templates/Sparkle/customer/mysql/mysqls_database.tpl
+++ b/templates/Sparkle/customer/mysql/mysqls_database.tpl
@@ -3,16 +3,12 @@
 	<td>{$row['description']}</td>
 	<td>{$row['size']}</td>
 	<if 1 < $count_mysqlservers><td>{$sql_root['caption']}</td></if>
-	<if $row['apsdb'] != '1'>
-		<td>
-			<a href="{$linker->getLink(array('section' => 'mysql', 'page' => 'mysqls', 'action' => 'edit', 'id' => $row['id']))}" style="text-decoration:none;">
-				<img src="templates/{$theme}/assets/img/icons/edit.png" alt="{$lng['panel']['edit']}" />
-			</a>&nbsp;
-			<a href="{$linker->getLink(array('section' => 'mysql', 'page' => 'mysqls', 'action' => 'delete', 'id' => $row['id']))}" style="text-decoration:none;">
-				<img src="templates/{$theme}/assets/img/icons/delete.png" alt="{$lng['panel']['delete']}" />
-			</a>
-		</td>
-	<else>
-		<td>{$lng['aps']['cannoteditordeleteapsdb']}</td>
-	</if>
+	<td>
+		<a href="{$linker->getLink(array('section' => 'mysql', 'page' => 'mysqls', 'action' => 'edit', 'id' => $row['id']))}" style="text-decoration:none;">
+			<img src="templates/{$theme}/assets/img/icons/edit.png" alt="{$lng['panel']['edit']}" />
+		</a>&nbsp;
+		<a href="{$linker->getLink(array('section' => 'mysql', 'page' => 'mysqls', 'action' => 'delete', 'id' => $row['id']))}" style="text-decoration:none;">
+			<img src="templates/{$theme}/assets/img/icons/delete.png" alt="{$lng['panel']['delete']}" />
+		</a>
+	</td>
 </tr>