diff --git a/airtime_mvc/application/Bootstrap.php b/airtime_mvc/application/Bootstrap.php
index dcb9ba090..abe6f467d 100644
--- a/airtime_mvc/application/Bootstrap.php
+++ b/airtime_mvc/application/Bootstrap.php
@@ -14,13 +14,6 @@ require_once CONFIG_PATH . "constants.php";
 
 Logging::setLogPath(LIBRETIME_LOG_DIR . '/zendphp.log');
 
-// We need to manually route because we can't load Zend without the database being initialized first.
-if (array_key_exists("REQUEST_URI", $_SERVER) && (stripos($_SERVER["REQUEST_URI"], "/provisioning/create") !== false)) {
-    $provisioningHelper = new ProvisioningHelper($CC_CONFIG["apiKey"][0]);
-    $provisioningHelper->createAction();
-    die();
-}
-
 Zend_Session::setOptions(array('strict' => true));
 Config::setAirtimeVersion();
 require_once (CONFIG_PATH . 'navigation.php');
@@ -29,7 +22,6 @@ Zend_Validate::setDefaultNamespaces("Zend");
 
 $front = Zend_Controller_Front::getInstance();
 $front->registerPlugin(new RabbitMqPlugin());
-$front->registerPlugin(new Zend_Controller_Plugin_ConversionTracking());
 $front->throwExceptions(false);
 
 /* The bootstrap class should only be used to initialize actions that return a view.
diff --git a/airtime_mvc/application/common/Billing.php b/airtime_mvc/application/common/Billing.php
deleted file mode 100644
index 18648f0bc..000000000
--- a/airtime_mvc/application/common/Billing.php
+++ /dev/null
@@ -1,439 +0,0 @@
-<?php
-
-define("AIRTIME_PRO_FREE_TRIAL_PLAN_ID", 34);
-define("WHMCS_AIRTIME_GROUP_ID", 15);
-
-class Billing
-{
-    // TODO: remove this once all existing customers have bandwidth limits set
-    public static $PLAN_TYPE_DEFAULTS = array(
-        "trial" => array(
-            "bandwidth_limit" => 3298534883328
-        ),
-        "hobbyist" => array(
-            "bandwidth_limit" => 1099511627776
-        ),
-        "starter" => array(
-            "bandwidth_limit" => 3298534883328
-        ),
-        "starter2" => array(
-            "bandwidth_limit" => 3298534883328
-        ),
-        "plus" => array(
-            "bandwidth_limit" => 10995116277760
-        ),
-        "plus2" => array(
-            "bandwidth_limit" => 10995116277760
-        ),
-        "premium" => array(
-            "bandwidth_limit" => 43980465111040
-        ),
-        "premium2" => array(
-            "bandwidth_limit" => 43980465111040
-        ),
-        "enterprise" => array(
-            "bandwidth_limit" => 164926744166400
-        ),
-        "complimentary" => array(
-            "bandwidth_limit" => 32985348833280
-        ),
-        "sida" => array(
-            "bandwidth_limit" => 32985348833280
-        ),
-        "custom" => array(
-            "bandwidth_limit" => 10995116277760
-        ),
-        "awesome-hobbyist-2015" => array(
-            "bandwidth_limit" => 1099511627776
-        ),
-        "awesome-starter-2015" => array(
-            "bandwidth_limit" => 3298534883328
-        ),
-        "awesome-plus-2015" => array(
-            "bandwidth_limit" => 10995116277760
-        ),
-        "awesome-premium-2015" => array(
-            "bandwidth_limit" => 43980465111040
-        ),
-    );
-
-    public static function getAPICredentials()
-    {
-        return array(
-            "username" => $_SERVER["WHMCS_USERNAME"],
-            "password" => $_SERVER["WHMCS_PASSWORD"],
-            "url" => "https://account.sourcefabric.com/includes/api.php?accesskey=".$_SERVER["WHMCS_ACCESS_KEY"],
-        );
-    }
-
-    /** Get the Airtime instance ID of the instance the customer is currently viewing. */
-    public static function getClientInstanceId()
-    {
-        //$currentProduct = Billing::getClientCurrentAirtimeProduct();
-        //return $currentProduct["id"];
-        //XXX: Major hack attack. Since this function gets called often, rather than querying WHMCS
-        //     we're just going to extract it from airtime.conf since it's the same as the rabbitmq username.
-        $CC_CONFIG = Config::getConfig();
-        $instanceId = $CC_CONFIG['rabbitmq']['user'];
-        if (!is_numeric($instanceId)) {
-            throw new Exception("Invalid instance id in " . __FUNCTION__ . ": " . $instanceId);
-        }
-        return $instanceId;
-    }
-
-    public static function getProducts()
-    {
-        //Making this static to cache the products during a single HTTP request.
-        //This saves us roundtrips to WHMCS if getProducts() is called multiple times.
-        static $products = array();
-        if (!empty($products))
-        {
-            return $products;
-        }
-
-        $credentials = self::getAPICredentials();
-
-        $postfields = array();
-        $postfields["username"] = $credentials["username"];
-        $postfields["password"] = md5($credentials["password"]);
-        $postfields["action"] = "getproducts";
-        $postfields["responsetype"] = "json";
-        //gid is the Airtime product group id on whmcs
-        $postfields["gid"] = WHMCS_AIRTIME_GROUP_ID;
-
-        $query_string = "";
-        foreach ($postfields AS $k=>$v) $query_string .= "$k=".urlencode($v)."&";
-
-        $result = self::makeRequest($credentials["url"], $query_string);
-        //Logging::info($result["products"]["product"]);
-        $products = $result["products"]["product"];
-
-        //Blacklist all free plans
-        //Hide the promo plans - we will tell the user if they are eligible for a promo plan
-        foreach ($products as $k => $p) {
-            if ($p["paytype"] === "free" || strpos($p["name"], "Awesome August 2015") !== false)
-            {
-                unset($products[$k]);
-            }
-        }
-
-        return $products;
-    }
-
-    public static function getProductPricesAndTypes()
-    {
-        $products = Billing::getProducts();
-        $productPrices = array();
-        $productTypes = array();
-
-        foreach ($products as $k => $p) {
-            $productPrices[$p["name"]] = array(
-                "monthly" => $p["pricing"]["USD"]["monthly"],
-                "annually" => $p["pricing"]["USD"]["annually"]
-            );
-            $productTypes[$p["pid"]] = $p["name"] . " ($" . $productPrices[$p['name']]['monthly'] . "/mo)";
-        }
-        return array($productPrices, $productTypes);
-    }
-
-    /** Get the plan (or product in WHMCS lingo) that the customer is currently on.
-     *  @return An associative array containing the fields for the product
-     *  */
-    public static function getClientCurrentAirtimeProduct()
-    {
-        static $airtimeProduct = null;
-        //Ghetto caching to avoid multiple round trips to WHMCS
-        if ($airtimeProduct) {
-            return $airtimeProduct;
-        }
-        $credentials = self::getAPICredentials();
-
-        $postfields = array();
-        $postfields["username"] = $credentials["username"];
-        $postfields["password"] = md5($credentials["password"]);
-        $postfields["action"] = "getclientsproducts";
-        $postfields["responsetype"] = "json";
-        $postfields["clientid"] = Application_Model_Preference::GetClientId();
-
-        $query_string = "";
-        foreach ($postfields AS $k=>$v) $query_string .= "$k=".urlencode($v)."&";
-
-        $result = self::makeRequest($credentials["url"], $query_string);
-
-        //XXX: Debugging / local testing
-        if ($_SERVER['SERVER_NAME'] == "localhost") {
-            $_SERVER['SERVER_NAME'] = "bananas.airtime.pro";
-        }
-
-        //This code must run on airtime.pro for it to work... it's trying to match
-        //the server's hostname with the client subdomain. Once it finds a match
-        //between the product and the server's hostname/subdomain, then it
-        //returns the ID of that product (aka. the service ID of an Airtime instance)
-        foreach ($result["products"]["product"] as $product)
-        {
-            if (strpos($product["groupname"], "Airtime") === FALSE)
-            {
-                //Ignore non-Airtime products
-                continue;
-            }
-            else
-            {
-                if ($product["status"] === "Active" ||
-                    $product["status"] === "Suspended") {
-                    $airtimeProduct = $product;
-                    $subdomain = '';
-
-                    foreach ($airtimeProduct['customfields']['customfield'] as $customField) {
-                        if ($customField['name'] === SUBDOMAIN_WHMCS_CUSTOM_FIELD_NAME) {
-                            $subdomain = $customField['value'];
-                            if (($subdomain . ".airtime.pro") === $_SERVER['SERVER_NAME']) {
-                                return $airtimeProduct;
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        throw new Exception("Unable to match subdomain to a service ID");
-    }
-
-    public static function getClientDetails()
-    {
-        try {
-            $credentials = self::getAPICredentials();
-
-            $postfields = array();
-            $postfields["username"] = $credentials["username"];
-            $postfields["password"] = md5($credentials["password"]);
-            $postfields["action"] = "getclientsdetails";
-            $postfields["stats"] = true;
-            $postfields["clientid"] = Application_Model_Preference::GetClientId();
-            $postfields["responsetype"] = "json";
-
-            $query_string = "";
-            foreach ($postfields AS $k=>$v) $query_string .= "$k=".urlencode($v)."&";
-
-            $arr = self::makeRequest($credentials["url"], $query_string);
-            return $arr["client"];
-        } catch (Exception $e) {
-            Logging::info($e->getMessage());
-        }
-        return array();
-    }
-
-    public static function makeRequest($url, $query_string) {
-        try {
-            $ch = curl_init();
-            curl_setopt($ch, CURLOPT_URL, $url);
-            curl_setopt($ch, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4 ); // WHMCS IP whitelist doesn't support IPv6
-            curl_setopt($ch, CURLOPT_POST, 1);
-            curl_setopt($ch, CURLOPT_TIMEOUT, 5); //Aggressive 5 second timeout
-            curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-            curl_setopt($ch, CURLOPT_POSTFIELDS, $query_string);
-            curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0);
-            curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0);
-            $jsondata = curl_exec($ch);
-            if (curl_error($ch)) {
-                //die("Connection Error: ".curl_errno($ch).' - '.curl_error($ch));
-                throw new Exception("WHMCS server down or invalid request.");
-            }
-            curl_close($ch);
-
-            return json_decode($jsondata, true);
-        } catch (Exception $e) {
-            Logging::info($e->getMessage());
-        }
-        return array();
-    }
-
-    public static function ensureClientIdIsValid()
-    {
-        if (Application_Model_Preference::GetClientId() == null)
-        {
-            throw new Exception("Invalid client ID: " . Application_Model_Preference::GetClientId());
-        }
-    }
-
-
-    /**
-     * @return True if VAT should be applied to the order, false otherwise.
-     */
-    public static function checkIfVatShouldBeApplied($vatNumber, $countryCode)
-    {
-        if ($countryCode === 'UK') {
-            $countryCode = 'GB'; //VIES database has it as GB
-        }
-        //We don't charge you VAT if you're not in the EU
-        if (!Billing::isCountryInEU($countryCode))
-        {
-            return false;
-        }
-
-        //So by here, we know you're in the EU.
-
-        //No VAT number? Then we charge you VAT.
-        if (empty($vatNumber)) {
-            return true;
-        }
-        //Check if VAT number is valid
-        return Billing::validateVATNumber($vatNumber, $countryCode);
-    }
-
-    public static function isCountryInEU($countryCode)
-    {
-        $euCountryCodes = array('BE', 'BG', 'CZ', 'DK', 'DE', 'EE', 'IE', 'EL', 'ES', 'FR',
-            'HR', 'IT', 'CY', 'LV', 'LT', 'LU', 'HU', 'MT', 'NL', 'AT',
-            'PL', 'PT', 'RO', 'SI', 'SK', 'FI', 'SE', 'UK', 'GB');
-
-        if (!in_array($countryCode, $euCountryCodes)) {
-            return false;
-        }
-        return true;
-    }
-
-    /**
-     * Check if an EU VAT number is valid, using the EU VIES validation web API.
-     *
-     * @param string $vatNumber - A VAT identifier (number), with or without the two letter country code at the
-     *                            start (either one works) .
-     * @param string $countryCode - A two letter country code
-     * @return boolean true if the VAT number is valid, false otherwise.
-     */
-    public static function validateVATNumber($vatNumber, $countryCode)
-    {
-        $vatNumber = str_replace(array(' ', '.', '-', ',', ', '), '', trim($vatNumber));
-
-        //If the first two letters are a country code, use that as the country code and remove those letters.
-        $firstTwoCharacters = substr($vatNumber, 0, 2);
-        if (preg_match("/[a-zA-Z][a-zA-Z]/", $firstTwoCharacters) === 1) {
-            $countryCode = strtoupper($firstTwoCharacters); //The country code from the VAT number overrides your country.
-            $vatNumber = substr($vatNumber, 2);
-        }
-        $client = new SoapClient("http://ec.europa.eu/taxation_customs/vies/checkVatService.wsdl");
-
-        if($client){
-            $params = array('countryCode' => $countryCode, 'vatNumber' => $vatNumber);
-            try{
-                $r = $client->checkVat($params);
-                if($r->valid == true){
-                    // VAT-ID is valid
-                    return true;
-                } else {
-                    // VAT-ID is NOT valid
-                    return false;
-                }
-            } catch(SoapFault $e) {
-                Logging::error('VIES EU VAT validation error: '.$e->faultstring);
-                if ($e->faultstring == "INVALID_INPUT") {
-                    return false;
-                }
-                //If there was another error with the VAT validation service, we allow
-                //the VAT number to pass. (eg. SERVER_BUSY, MS_UNAVAILABLE, TIMEOUT, SERVICE_UNAVAILABLE)
-                return true;
-            }
-        } else {
-            // Connection to host not possible, europe.eu down?
-            Logging::error('VIES EU VAT validation error: Host unreachable');
-            //If there was an error with the VAT validation service, we allow
-            //the VAT number to pass.
-            return true;
-        }
-        return false;
-    }
-
-
-    public static function addVatToInvoice($invoice_id)
-    {
-        $credentials = self::getAPICredentials();
-
-        //First we need to get the invoice details: sub total, and total
-        //so we can calcuate the amount of VAT to add
-        $invoicefields = array();
-        $invoicefields["username"] = $credentials["username"];
-        $invoicefields["password"] = md5($credentials["password"]);
-        $invoicefields["action"] = "getinvoice";
-        $invoicefields["invoiceid"] = $invoice_id;
-        $invoicefields["responsetype"] = "json";
-
-        $invoice_query_string = "";
-        foreach ($invoicefields as $k=>$v) $invoice_query_string .= "$k=".urlencode($v)."&";
-
-        //TODO: error checking
-        $result = Billing::makeRequest($credentials["url"], $invoice_query_string);
-
-        $vat_amount = $result["subtotal"] * (VAT_RATE/100);
-        $invoice_total = $result["total"] + $vat_amount;
-
-        //Second, update the invoice with the VAT amount and updated total
-        $postfields = array();
-        $postfields["username"] = $credentials["username"];
-        $postfields["password"] = md5($credentials["password"]);
-        $postfields["action"] = "updateinvoice";
-        $postfields["invoiceid"] = $invoice_id;
-        $postfields["tax"] = "$vat_amount";
-        $postfields["taxrate"] = strval(VAT_RATE);
-        $postfields["total"] = "$invoice_total";
-        $postfields["responsetype"] = "json";
-
-        $query_string = "";
-        foreach ($postfields as $k=>$v) $query_string .= "$k=".urlencode($v)."&";
-
-        //TODO: error checking
-        $result = Billing::makeRequest($credentials["url"], $query_string);
-    }
-
-    public static function getInvoices()
-    {
-        Billing::ensureClientIdIsValid();
-        $credentials = Billing::getAPICredentials();
-
-        $postfields = array();
-        $postfields["username"] = $credentials["username"];
-        $postfields["password"] = md5($credentials["password"]);
-        $postfields["action"] = "getinvoices";
-        $postfields["responsetype"] = "json";
-        $postfields["userid"] = Application_Model_Preference::GetClientId();
-
-        $query_string = "";
-        foreach ($postfields AS $k=>$v) $query_string .= "$k=".urlencode($v)."&";
-
-        $result = Billing::makeRequest($credentials["url"], $query_string);
-
-        $invoices = array();
-        if ($result["invoices"]) {
-            $invoices = $result["invoices"]["invoice"];
-        }
-        return $invoices;
-    }
-
-    /**
-     *  Checks if the customer has any unpaid invoices and if so, returns
-     *  the ID of one of them. Returns 0 otherwise.
-     */
-    public static function checkForUnpaidInvoice() {
-        $invoices = self::getInvoices();
-        $unpaidInvoice = 0;
-        $unpaidInvoices = 0;
-        foreach ($invoices as $invoice)
-        {
-            if ($invoice['status'] == 'Unpaid') {
-                $unpaidInvoices += 1;
-                $unpaidInvoice = $invoice;
-            }
-        }
-        if ($unpaidInvoices > 0) {
-            return $unpaidInvoice;
-        } else {
-            return 0;
-        }
-    }
-
-    public static function isStationPodcastAllowed() {
-        $planLevel = Application_Model_Preference::GetPlanLevel();
-        if ($planLevel == "hobbyist") {
-            return false;
-        } else {
-            return true;
-        }
-    }
-}
diff --git a/airtime_mvc/application/common/GoogleAnalytics.php b/airtime_mvc/application/common/GoogleAnalytics.php
deleted file mode 100644
index 77a36f44a..000000000
--- a/airtime_mvc/application/common/GoogleAnalytics.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php
-
-class Application_Common_GoogleAnalytics
-{
-
-    /** Returns a string containing the JavaScript code to pass some billing account info
-     *  into Google Tag Manager / Google Analytics, so we can track things like the plan type.
-     */
-    public static function generateGoogleTagManagerDataLayerJavaScript()
-    {
-        $code = "";
-        if (LIBRETIME_ENABLE_GOOGLE_ANALYTICS !== true) {
-            return $code;
-        }
-
-        try {
-            $clientId = Application_Model_Preference::GetClientId();
-
-            $plan = Application_Model_Preference::GetPlanLevel();
-            $isTrial = ($plan == "trial");
-
-            //Figure out how long the customer has been around using a mega hack.
-            //(I'm avoiding another round trip to WHMCS for now...)
-            //We calculate it based on the trial end date...
-            $trialEndDateStr = Application_Model_Preference::GetTrialEndingDate();
-            if ($trialEndDateStr == '') {
-                $accountDuration = 0;
-            } else {
-                $today = new DateTime();
-                $trialEndDate = new DateTime($trialEndDateStr);
-                $trialDuration = new DateInterval("P30D"); //30 day trial duration
-                $accountCreationDate = $trialEndDate->sub($trialDuration);
-                $interval = $today->diff($accountCreationDate);
-                $accountDuration = $interval->days;
-            }
-
-            $code = "$( document ).ready(function() {
-                    dataLayer.push({
-                                    'UserID':  '" . $clientId . "',
-                                    'Customer':  'Customer',
-                                    'PlanType':  '" . $plan . "',
-                                    'Trial':  '" . $isTrial . "',
-                                    'AccountDuration':  '" . strval($accountDuration) . "'
-                                    });
-                     });";
-            //No longer sending these variables because we used to make a query to WHMCS
-            //to fetch them, which was slow.
-            //               'ZipCode':  '" . $postcode . "',
-            //               'Country':  '" . $country . "',
-
-        } catch (Exception $e) {
-            Logging::error($e);
-            return "";
-        }
-        return $code;
-    }
-
-    /** Generate the JavaScript snippet that logs a trial to paid conversion  */
-    public static function generateConversionTrackingJavaScript()
-    {
-        $code = "";
-        if (LIBRETIME_ENABLE_GOOGLE_ANALYTICS !== true) {
-            return $code;
-        }
-
-        $newPlan = Application_Model_Preference::GetPlanLevel();
-        $oldPlan = Application_Model_Preference::GetOldPlanLevel();
-
-        $code = "dataLayer.push({'event': 'Conversion',
-                                 'Conversion': 'Trial to Paid',
-                                 'Old Plan' : '$oldPlan',
-                                 'New Plan' : '$newPlan'});";
-        return $code;
-    }
-
-    /** Return true if the user used to be on a trial plan and was just converted to a paid plan. */
-    public static function didPaidConversionOccur($request)
-    {
-        if (LIBRETIME_ENABLE_GOOGLE_ANALYTICS !== true) {
-            return false;
-        }
-
-        $userInfo = Zend_Auth::getInstance()->getStorage()->read();
-        if ($userInfo) {
-            $user = new Application_Model_User($userInfo->id);
-        } else {
-            return;
-        }
-
-        $oldPlan = Application_Model_Preference::GetOldPlanLevel();
-
-        if ($user->isSuperAdmin() &&
-            !$user->isSourcefabricAdmin() &&
-            $request->getControllerKey() !== "thank-you")
-        {
-            //Only tracking trial->paid conversions for now.
-            if ($oldPlan == "trial")
-            {
-                return true;
-            }
-        }
-        return false;
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/application/common/LocaleHelper.php b/airtime_mvc/application/common/LocaleHelper.php
index 8b1ff12ec..82c5b243a 100644
--- a/airtime_mvc/application/common/LocaleHelper.php
+++ b/airtime_mvc/application/common/LocaleHelper.php
@@ -2,10 +2,6 @@
 
 // Global functions for translating domain-specific strings
 
-function _pro($str) {
-    return dgettext("pro", $str);
-}
-
 class Application_Common_LocaleHelper {
 
     /**
diff --git a/airtime_mvc/application/common/ProvisioningHelper.php b/airtime_mvc/application/common/ProvisioningHelper.php
deleted file mode 100644
index 80a73b960..000000000
--- a/airtime_mvc/application/common/ProvisioningHelper.php
+++ /dev/null
@@ -1,242 +0,0 @@
-<?php
-
-/** This class provides the business logic for station provisioning.  */
-class ProvisioningHelper
-{
-
-    /* @var $dbh PDO */
-    static $dbh;
-
-    // Parameter values
-    private $dbuser, $dbpass, $dbname, $dbhost, $dbowner, $apikey;
-    private $instanceId;
-    private $stationName, $description;
-    private $defaultIcecastPassword;
-    private $bandwidthLimit;
-
-    public function __construct($apikey)
-    {
-        $this->apikey = $apikey;
-    }
-
-    /**
-     * Endpoint for setting up and installing the Airtime database. This all has to be done without Zend
-     * which is why the code looks so old school (eg. http_response_code). (We can't currently bootstrap our
-     * Zend app without the database unfortunately.)
-     */
-    public function createAction()
-    {
-        $apikey = "";
-        if (isset($_SERVER['PHP_AUTH_USER']))
-        {
-            $apikey = $_SERVER['PHP_AUTH_USER'];
-        }
-        if ($apikey != $this->apikey) {
-            Logging::info("Invalid API Key: $apikey");
-            http_response_code(403);
-            echo "ERROR: Incorrect API key";
-            return;
-        }
-
-        try {
-
-            $this->parsePostParams();
-
-            //For security, the Airtime Pro provisioning system creates the database for the user.
-            if ($this->dbhost && !empty($this->dbhost)) {
-                $this->setNewDatabaseConnection();
-
-                if (!$this->checkDatabaseExists()) {
-                    throw new DatabaseDoesNotExistException("ERROR: $this->dbname database does not exist.");
-                }
-
-                //We really want to do this check because all the Propel-generated SQL starts with "DROP TABLE IF EXISTS".
-                //If we don't check, then a second call to this API endpoint would wipe all the tables!
-                if ($this->checkTablesExist()) {
-                    throw new DatabaseAlreadyExistsException();
-                }
-
-                $this->createDatabaseTables();
-                $this->initializeMusicDirsTable($this->instanceId);
-            }
-
-            //$this->createDatabase();
-
-            //All we need to do is create the database tables.
-
-            $this->initializePrefs();
-        } catch (DatabaseDoesNotExistException $e) {
-            http_response_code(400);
-            Logging::error($e->getMessage());
-            echo $e->getMessage() . PHP_EOL;
-            return;
-        } catch (DatabaseAlreadyExistsException $e) {
-            // When we recreate a terminated instance, the process will fail
-            // if we return a 40x response here. In order to circumvent this,
-            // just return a 200; we still avoid dropping the existing tables
-            http_response_code(200);
-            Logging::info($e->getMessage());
-            echo $e->getMessage() . PHP_EOL;
-            return;
-        }
-
-        http_response_code(201);
-    }
-
-    /**
-     * Check if the database settings and credentials given are valid
-     * @return boolean true if the database given exists and the user is valid and can access it
-     */
-    private function checkDatabaseExists()
-    {
-        $statement = self::$dbh->prepare("SELECT datname FROM pg_database WHERE datname = :dbname");
-        $statement->execute(array(":dbname" => $this->dbname));
-        $result = $statement->fetch();
-        return isset($result[0]);
-    }
-
-    private function checkTablesExist()
-    {
-        try {
-            $result = self::$dbh->query("SELECT 1 FROM cc_files LIMIT 1");
-        } catch (Exception $e) {
-            // We got an exception == table not found
-            echo($e . PHP_EOL);
-            return FALSE;
-        }
-
-        // Result is either boolean FALSE (no table found) or PDOStatement Object (table found)
-        return $result !== FALSE;
-    }
-
-    private function parsePostParams()
-    {
-        $this->dbuser = $_POST['dbuser'];
-        $this->dbpass = $_POST['dbpass'];
-        $this->dbname = $_POST['dbname'];
-        $this->dbhost = $_POST['dbhost'];
-        $this->dbowner = $_POST['dbowner'];
-        $this->instanceId = $_POST['instanceid'];
-
-        if (isset($_POST['station_name'])) {
-            $this->stationName = $_POST['station_name'];
-        }
-        if (isset($_POST['description'])) {
-            $this->description = $_POST['description'];
-        }
-        if (isset($_POST['icecast_pass'])) {
-            $this->defaultIcecastPassword = $_POST['icecast_pass'];
-        }
-        if (isset($_POST['bandwidth_limit'])) {
-            $this->bandwidthLimit = $_POST['bandwidth_limit'];
-        }
-    }
-
-    /**
-     * Set up a new database connection based on the parameters in the request
-     * @throws PDOException upon failure to connect
-     */
-    private function setNewDatabaseConnection()
-    {
-        self::$dbh = new PDO("pgsql:host=" . $this->dbhost
-                             . ";dbname=" . $this->dbname
-                             . ";port=5432" . ";user=" . $this->dbuser
-                             . ";password=" . $this->dbpass);
-        //Turn on PDO exceptions because they're off by default.
-        //self::$dbh->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
-        $err = self::$dbh->errorInfo();
-        if ($err[1] != null) {
-            throw new PDOException("ERROR: Could not connect to database");
-        }
-    }
-
-    /**
-     * Creates the Airtime database using the given credentials
-     * @throws Exception
-     */
-    private function createDatabase()
-    {
-        Logging::info("Creating database...");
-        $statement = self::$dbh->prepare("CREATE DATABASE " . pg_escape_string($this->dbname)
-                                         . " WITH ENCODING 'UTF8' TEMPLATE template0"
-                                         . " OWNER " . pg_escape_string($this->dbowner));
-        if (!$statement->execute()) {
-            throw new Exception("ERROR: Failed to create Airtime database");
-        }
-    }
-
-    /**
-     * Install the Airtime database
-     * @throws Exception
-     */
-    private function createDatabaseTables()
-    {
-        Logging::info("Creating database tables...");
-        $sqlDir = dirname(APPLICATION_PATH) . "/build/sql/";
-        $files = array("schema.sql", "sequences.sql", "views.sql", "triggers.sql", "defaultdata.sql");
-        foreach ($files as $f) {
-            /*
-             * Unfortunately, we need to use exec here due to PDO's lack of support for importing
-             * multi-line .sql files. PDO->exec() almost works, but any SQL errors stop the import,
-             * so the necessary DROPs on non-existent tables make it unusable. Prepared statements
-             * have multiple issues; they similarly die on any SQL errors, fail to read in multi-line
-             * commands, and fail on any unescaped ? or $ characters.
-             */
-            exec("PGPASSWORD=$this->dbpass psql -U $this->dbuser --dbname $this->dbname -h $this->dbhost -f $sqlDir$f", $out, $status);
-            if ($status != 0) {
-                throw new Exception("ERROR: Failed to create database tables");
-            }
-        }
-    }
-
-    private function initializeMusicDirsTable($instanceId)
-    {
-        if (!is_string($instanceId) || empty($instanceId) || !is_numeric($instanceId))
-        {
-            throw new Exception("Invalid instance id: " . $instanceId);
-        }
-
-        $instanceIdPrefix = $instanceId[0];
-
-        //Reinitialize Propel, just in case...
-        Propel::init(__DIR__."/../configs/airtime-conf-production.php");
-
-        //Create the cc_music_dir entry
-        $musicDir = new CcMusicDirs();
-        $musicDir->setType("stor");
-        $musicDir->setExists(true);
-        $musicDir->setWatched(true);
-        $musicDir->setDirectory("/mnt/airtimepro/instances/$instanceIdPrefix/$instanceId/srv/airtime/stor/");
-        $musicDir->save();
-    }
-
-    /**
-     * Initialize preference values passed from the dashboard (if any exist)
-     */
-    private function initializePrefs() {
-        if ($this->stationName) {
-            Application_Model_Preference::SetStationName($this->stationName);
-        }
-        if ($this->description) {
-            Application_Model_Preference::SetStationDescription($this->description);
-        }
-        if (isset($this->defaultIcecastPassword)) {
-            Application_Model_Preference::setDefaultIcecastPassword($this->defaultIcecastPassword);
-        }
-        if (isset($this->bandwidthLimit)) {
-            Application_Model_Preference::setBandwidthLimit($this->bandwidthLimit);
-        }
-    }
-
-}
-
-class DatabaseAlreadyExistsException extends Exception {
-    private static $_defaultMessage = "ERROR: airtime tables already exists";
-    public function __construct($message = null, $code = 0, Exception $previous = null) {
-        $message = _((is_null($message) ? self::$_defaultMessage : $message));
-        parent::__construct($message, $code, $previous);
-    }
-}
-
-class DatabaseDoesNotExistException extends Exception {}
-
diff --git a/airtime_mvc/application/common/UsabilityHints.php b/airtime_mvc/application/common/UsabilityHints.php
index 7acf92446..6ec5fc6de 100644
--- a/airtime_mvc/application/common/UsabilityHints.php
+++ b/airtime_mvc/application/common/UsabilityHints.php
@@ -103,13 +103,6 @@ class Application_Common_UsabilityHints
                     "<a href=\"/schedule\">",
                     "</a>");
             }
-        } else if (LIBRETIME_ENABLE_BILLING === true && $userIsOnShowbuilderPage && $userIsSuperAdmin) {
-            $unpaidInvoice = Billing::checkForUnpaidInvoice();
-            if ($unpaidInvoice != null) {
-                $invoiceUrl = "/billing/invoice?invoiceid=" . $unpaidInvoice['id'];
-                $amount = $unpaidInvoice['currencyprefix'] . $unpaidInvoice['total'];
-                return _pro(sprintf("You have an unpaid invoice for %s due soon. <a href='%s'>Please pay it to keep your station on the air.</a>", $amount, $invoiceUrl));;
-            }
         }
         return "";
     }
@@ -225,4 +218,4 @@ class Application_Common_UsabilityHints
             return false;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/airtime_mvc/application/configs/ACL.php b/airtime_mvc/application/configs/ACL.php
index be904e86e..917e70abc 100644
--- a/airtime_mvc/application/configs/ACL.php
+++ b/airtime_mvc/application/configs/ACL.php
@@ -14,7 +14,6 @@ $ccAcl->add(new Zend_Acl_Resource('library'))
       ->add(new Zend_Acl_Resource('user'))
       ->add(new Zend_Acl_Resource('error'))
       ->add(new Zend_Acl_Resource('login'))
-      ->add(new Zend_Acl_Resource('whmcs-login'))
       ->add(new Zend_Acl_Resource('playlist'))
       ->add(new Zend_Acl_Resource('plupload'))
       ->add(new Zend_Acl_Resource('schedule'))
@@ -38,9 +37,6 @@ $ccAcl->add(new Zend_Acl_Resource('library'))
       ->add(new Zend_Acl_Resource('rest:podcast'))
       ->add(new Zend_Acl_Resource('rest:podcast-episodes'))
       ->add(new Zend_Acl_Resource('podcast'))
-      ->add(new Zend_Acl_Resource('billing'))
-      ->add(new Zend_Acl_Resource('thank-you'))
-      ->add(new Zend_Acl_Resource('provisioning'))
       ->add(new Zend_Acl_Resource('player'))
       ->add(new Zend_Acl_Resource('render'))
       ->add(new Zend_Acl_Resource('soundcloud'))
@@ -51,7 +47,6 @@ $ccAcl->add(new Zend_Acl_Resource('library'))
 /** Creating permissions */
 $ccAcl->allow('G', 'index')
       ->allow('G', 'login')
-      ->allow('G', 'whmcs-login')
       ->allow('G', 'error')
       ->allow('G', 'user', 'edit-user')
       ->allow('G', 'showbuilder')
@@ -63,7 +58,6 @@ $ccAcl->allow('G', 'index')
       ->allow('G', 'webstream')
       ->allow('G', 'locale')
       ->allow('G', 'upgrade')
-      ->allow('G', 'provisioning')
       ->allow('G', 'downgrade')
       ->allow('G', 'rest:show-image', 'get')
       ->allow('G', 'rest:media', 'get')
@@ -89,9 +83,7 @@ $ccAcl->allow('G', 'index')
       ->allow('A', 'playouthistorytemplate')
       ->allow('A', 'user')
       ->allow('A', 'systemstatus')
-      ->allow('A', 'preference')
-      ->allow('S', 'thank-you')
-      ->allow('S', 'billing');
+      ->allow('A', 'preference');
       
 
 $aclPlugin = new Zend_Controller_Plugin_Acl($ccAcl);
diff --git a/airtime_mvc/application/configs/constants.php b/airtime_mvc/application/configs/constants.php
index 269c79534..df7e45d1c 100644
--- a/airtime_mvc/application/configs/constants.php
+++ b/airtime_mvc/application/configs/constants.php
@@ -106,25 +106,9 @@ define('UI_PLAYLISTCONTROLLER_OBJ_SESSNAME', 'PLAYLISTCONTROLLER_OBJ');
 /*define('UI_PLAYLIST_SESSNAME', 'PLAYLIST');
 define('UI_BLOCK_SESSNAME', 'BLOCK');*/
 
-// Google Analytics integration
-define('LIBRETIME_ENABLE_GOOGLE_ANALYTICS', false);
-
-//WHMCS integration
-define('LIBRETIME_ENABLE_WHMCS',            false);
-define('WHMCS_PASSWORD_RESET_URL',          'https://account.example.com/pwreset.php');
-define('WHMCS_API_URL'                    , 'https://account.example.org/includes/api.php');
-define('SUBDOMAIN_WHMCS_CUSTOM_FIELD_NAME', 'Choose your domain');
-
-//LiveChat integration
-define('LIBRETIME_ENABLE_LIVECHAT', false);
-
 //Sentry error logging
 define('SENTRY_CONFIG_PATH', LIBRETIME_CONF_DIR . '/sentry.airtime_web.ini');
 
-//Provisioning status
-define('PROVISIONING_STATUS_SUSPENDED' , 'Suspended');
-define('PROVISIONING_STATUS_ACTIVE' , 'Active');
-
 //TuneIn integration
 define("TUNEIN_API_URL", "http://air.radiotime.com/Playing.ashx");
 
@@ -150,6 +134,3 @@ define('STATION_PODCAST_SERVICE_NAME', 'station_podcast');
 //define('IMPORTED_PODCAST', 1);
 
 define('ITUNES_XML_NAMESPACE_URL', 'http://www.itunes.com/dtds/podcast-1.0.dtd');
-
-// Billing configuration
-define('LIBRETIME_ENABLE_BILLING', false);
diff --git a/airtime_mvc/application/configs/navigation.php b/airtime_mvc/application/configs/navigation.php
index fb666613c..271ffae3f 100644
--- a/airtime_mvc/application/configs/navigation.php
+++ b/airtime_mvc/application/configs/navigation.php
@@ -148,38 +148,6 @@ $pages[] = array(
 
     )
 );
-if (LIBRETIME_ENABLE_BILLING === true) {
-    $pages[] = array(
-        'label' =>  (Application_Model_Preference::GetPlanLevel()=="trial") ? "<i class='icon-star icon-orange'></i><span style='color: #ff5d1a'>"._('Upgrade')."</span>" : "<i class='icon-briefcase icon-white'></i>"._('Billing'),
-        'controller' => 'billing',
-        'action' => 'upgrade',
-        'resource' => 'billing',
-        'title' => 'Billing',
-        'pages' => array(
-            array(
-                'label' => _('Account Plans'),
-                'module' => 'default',
-                'controller' => 'billing',
-                'action' => 'upgrade',
-                'resource' => 'billing'
-            ),
-            array(
-                'label' => _('Account Details'),
-                'module' => 'default',
-                'controller' => 'billing',
-                'action' => 'client',
-                'resource' => 'billing'
-            ),
-            array(
-                'label' => _('View Invoices'),
-                'module' => 'default',
-                'controller' => 'billing',
-                'action' => 'invoices',
-                'resource' => 'billing'
-            )
-        )
-    );
-}
 $pages[] = array(
     'label'      => _('Help'),
     'controller' => 'dashboard',
diff --git a/airtime_mvc/application/controllers/ApiController.php b/airtime_mvc/application/controllers/ApiController.php
index 1f8283720..1d070f1f4 100644
--- a/airtime_mvc/application/controllers/ApiController.php
+++ b/airtime_mvc/application/controllers/ApiController.php
@@ -57,7 +57,6 @@ class ApiController extends Zend_Controller_Action
                 ->addActionContext('status'                        , 'json')
                 ->addActionContext('register-component'            , 'json')
                 ->addActionContext('update-liquidsoap-status'      , 'json')
-                ->addActionContext('live-chat'                     , 'json')
                 ->addActionContext('update-file-system-mount'      , 'json')
                 ->addActionContext('handle-watched-dir-missing'    , 'json')
                 ->addActionContext('rabbitmq-do-push'              , 'json')
diff --git a/airtime_mvc/application/controllers/BillingController.php b/airtime_mvc/application/controllers/BillingController.php
deleted file mode 100644
index 5a5f7e452..000000000
--- a/airtime_mvc/application/controllers/BillingController.php
+++ /dev/null
@@ -1,301 +0,0 @@
-<?php
-
-define('VAT_RATE', 19.00);
-
-class BillingController extends Zend_Controller_Action {
-
-    public function init()
-    {       
-        //Two of the actions in this controller return JSON because they're used for AJAX:
-        $ajaxContext = $this->_helper->getHelper('AjaxContext');
-        $ajaxContext->addActionContext('vat-validator', 'json')
-                    ->addActionContext('is-country-in-eu', 'json')
-                    ->initContext();
-    }
-    
-    public function indexAction()
-    {
-        $this->_redirect('billing/upgrade');
-    }
-
-    public function upgradeAction()
-    {
-        //If you're not on a trial and you're suspended, we don't let you access the plans page and redirect you to the invoices
-        //page to force you to pay your bills first.
-        $isTrial = (Application_Model_Preference::GetPlanLevel() == 'trial');
-        if (!$isTrial && (Application_Model_Preference::getProvisioningStatus() == PROVISIONING_STATUS_SUSPENDED)) {
-            $this->_redirect('billing/invoices');
-        }
-
-        Zend_Layout::getMvcInstance()->assign('parent_page', 'Billing');
-
-        $CC_CONFIG = Config::getConfig();
-        $baseUrl = Application_Common_OsPath::getBaseDir();
-        $this->view->headLink()->appendStylesheet($baseUrl.'css/billing.css?'.$CC_CONFIG['airtime_version']);
-        Billing::ensureClientIdIsValid();
-
-        //Zend's CSRF token element requires the session to be open for writing
-        SessionHelper::reopenSessionForWriting();
-
-        $request = $this->getRequest();
-        $form = new Application_Form_BillingUpgradeDowngrade();
-
-        if ($request->isPost()) {
-                        
-            $formData = $request->getPost();
-
-            if ($form->isValid($formData)) {
-
-                $credentials = Billing::getAPICredentials();
-
-                //Check if VAT should be applied or not to this invoice.
-                if (in_array("7", $formData["customfields"])) {
-                    $apply_vat = Billing::checkIfVatShouldBeApplied($formData["customfields"]["7"], $formData["country"]);
-                } else {
-                    $apply_vat = false;
-                }
-
-                $placeAnUpgradeOrder = true;
-
-                $currentPlanProduct = Billing::getClientCurrentAirtimeProduct();
-                $currentPlanProductId = $currentPlanProduct["pid"];
-                $currentPlanProductBillingCycle = strtolower($currentPlanProduct["billingcycle"]);
-                //If there's been no change in the plan or the billing cycle, we should not
-                //place an upgrade order. WHMCS doesn't allow this in its web interface,
-                //and it freaks out and does the wrong thing if we do it via the API
-                //so we have to do avoid that.
-                if (($currentPlanProductId == $formData["newproductid"]) &&
-                    ($currentPlanProductBillingCycle == $formData["newproductbillingcycle"])
-                ) {
-                    $placeAnUpgradeOrder = false;
-                }
-
-                $postfields = array();
-                $postfields["username"] = $credentials["username"];
-                $postfields["password"] = md5($credentials["password"]);
-                $postfields["action"] = "upgradeproduct";
-                $postfields["clientid"] = Application_Model_Preference::GetClientId();
-
-                $postfields["serviceid"] = Billing::getClientInstanceId();
-                $postfields["type"] = "product";
-                $postfields["newproductid"] = $formData["newproductid"];
-                $postfields["newproductbillingcycle"] = $formData["newproductbillingcycle"];
-                $postfields["paymentmethod"] = $formData["paymentmethod"];
-                $postfields["responsetype"] = "json";
-
-                $upgrade_query_string = "";
-                foreach ($postfields AS $k => $v) $upgrade_query_string .= "$k=" . urlencode($v) . "&";
-
-                //update client info
-
-                $clientfields = array();
-                $clientfields["username"] = $credentials["username"];
-                $clientfields["password"] = md5($credentials["password"]);
-                $clientfields["action"] = "updateclient";
-                $clientfields["clientid"] = Application_Model_Preference::GetClientId();
-                $clientfields["customfields"] = base64_encode(serialize($formData["customfields"]));
-                unset($formData["customfields"]);
-                $clientfields["responsetype"] = "json";
-                unset($formData["newproductid"]);
-                unset($formData["newproductbillingcycle"]);
-                unset($formData["paymentmethod"]);
-                unset($formData["action"]);
-                $clientfields = array_merge($clientfields, $formData);
-                unset($clientfields["password2verify"]);
-                unset($clientfields["submit"]);
-                $client_query_string = "";
-                foreach ($clientfields AS $k => $v) $client_query_string .= "$k=" . urlencode($v) . "&";
-
-                //Update the client details in WHMCS first
-                $result = Billing::makeRequest($credentials["url"], $client_query_string);
-                Logging::info($result);
-                if ($result["result"] == "error") {
-                    $this->setErrorMessage();
-                    $this->view->form = $form;
-                    return;
-                }
-
-                //If there were no changes to the plan or billing cycle, we just redirect you to the
-                //invoices screen and show a message.
-                if (!$placeAnUpgradeOrder) {
-                    $this->_redirect('billing/invoices?planupdated');
-                    return;
-                }
-
-                //Then place an upgrade order in WHMCS
-                $result = Billing::makeRequest($credentials["url"], $upgrade_query_string);
-                if ($result["result"] == "error") {
-                    Logging::info($_SERVER['HTTP_HOST'] . " - Account upgrade failed. - " . $result["message"]);
-                    $this->setErrorMessage();
-                    $this->view->form = $form;
-                } else {
-                    Logging::info($_SERVER['HTTP_HOST'] . "Account plan upgrade request:");
-                    Logging::info($result);
-
-                    // Disable the view and the layout here, squashes an error.
-                    $this->view->layout()->disableLayout();
-                    $this->_helper->viewRenderer->setNoRender(true);
-
-                    if ($apply_vat) {
-                        Billing::addVatToInvoice($result["invoiceid"]);
-                    }
-
-                    // there may not be an invoice created if the client is downgrading
-                    if (!empty($result["invoiceid"])) {
-                        self::viewInvoice($result["invoiceid"]);
-                    } else {
-                        $this->_redirect('billing/invoices?planupdated');
-                        return;
-                    }
-                }
-            } else {
-                $this->view->form = $form;
-            }
-        } else {
-            $this->view->form = $form;
-        }
-    }
-    
-    
-    public function isCountryInEuAction()
-    {
-        // Disable the view and the layout
-        $this->view->layout()->disableLayout();
-        $this->_helper->viewRenderer->setNoRender(true);
- 
-        $request = $this->getRequest();
-        if (!$request->isPost()) {
-            throw new Exception("Must POST data to isCountryInEuAction.");
-        }
-        $formData = $request->getPost();
-    
-        //Set the return JSON value
-        $this->_helper->json(array("result"=>Billing::isCountryInEU($formData["country"])));
-    }
-    
-    public function vatValidatorAction()
-    {
-        // Disable the view and the layout
-        $this->view->layout()->disableLayout();
-        $this->_helper->viewRenderer->setNoRender(true);
-        
-        $request = $this->getRequest();
-        if (!$request->isPost()) {
-            throw new Exception("Must POST data to vatValidatorAction.");
-        }
-        $formData = $request->getPost();
-        
-        $vatNumber = trim($formData["vatnumber"]);
-        if (empty($vatNumber)) {
-            $this->_helper->json(array("result"=>false));
-        }
-        
-        //Set the return JSON value
-        $this->_helper->json(array("result"=>Billing::checkIfVatShouldBeApplied($vatNumber, $formData["country"])));
-    }
-
-
-    private function setErrorMessage($msg=null)
-    {
-        if (!is_null($msg)) {
-            $this->view->errorMessage = $msg;
-        } else {
-            $this->view->errorMessage = "An error occurred and we could not update your account. Please contact support for help.";
-        }
-    }
-
-    private function setSuccessMessage($msg=null)
-    {
-        if (!is_null($msg)) {
-            $this->view->successMessage = $msg;
-        } else {
-            $this->view->successMessage = "Your account has been updated.";
-        }
-    }
-
-    private static function viewInvoice($invoice_id)
-    {
-        $whmcsurl = "https://account.sourcefabric.com/dologin.php";
-        $autoauthkey = $_SERVER["WHMCS_AUTOAUTH_KEY"];
-        $timestamp = time(); //whmcs timezone?
-        $client = Billing::getClientDetails();
-        $email = $client["email"];
-        $hash = sha1($email.$timestamp.$autoauthkey);
-        $goto = "viewinvoice.php?id=".$invoice_id;
-        header("Location: ".$whmcsurl."?email=$email&timestamp=$timestamp&hash=$hash&goto=$goto");
-    }
-
-    public function clientAction()
-    {
-        Zend_Layout::getMvcInstance()->assign('parent_page', 'Billing');
-
-        $CC_CONFIG = Config::getConfig();
-        $baseUrl = Application_Common_OsPath::getBaseDir();
-        $this->view->headLink()->appendStylesheet($baseUrl.'css/billing.css?'.$CC_CONFIG['airtime_version']);
-
-        //Zend's CSRF token element requires the session to be open for writing
-        SessionHelper::reopenSessionForWriting();
-
-        $request = $this->getRequest();
-        $form = new Application_Form_BillingClient();
-        Billing::ensureClientIdIsValid();
-        if ($request->isPost()) {
-            $formData = $request->getPost();
-            if ($form->isValid($formData)) {
-            
-                $credentials = Billing::getAPICredentials();
-                
-                $postfields = array();
-                $postfields["username"] = $credentials["username"];
-                $postfields["password"] = md5($credentials["password"]);
-                $postfields["action"] = "updateclient";
-
-                $postfields["customfields"] = base64_encode(serialize($formData["customfields"]));
-                unset($formData["customfields"]);
-                
-                $postfields["clientid"] = Application_Model_Preference::GetClientId();
-                $postfields["responsetype"] = "json";
-                $postfields = array_merge($postfields, $formData);
-                unset($postfields["password2verify"]);
-                unset($postfields["submit"]);
-                
-                $query_string = "";
-                foreach ($postfields AS $k=>$v) $query_string .= "$k=".urlencode($v)."&";
-                
-                $result = Billing::makeRequest($credentials["url"], $query_string);
-
-                if ($result["result"] == "error") {
-                    $this->setErrorMessage();
-                } else {
-                    $form = new Application_Form_BillingClient();
-                    $this->setSuccessMessage();
-                }
-                
-                $this->view->form = $form;
-            } else {
-                $this->view->form = $form;
-            }
-        } else {
-            $this->view->form = $form;
-        }
-    }
-
-    public function invoicesAction()
-    {
-        Zend_Layout::getMvcInstance()->assign('parent_page', 'Billing');
-
-        $CC_CONFIG = Config::getConfig();
-        $baseUrl = Application_Common_OsPath::getBaseDir();
-        $this->view->headLink()->appendStylesheet($baseUrl.'css/billing.css?'.$CC_CONFIG['airtime_version']);
-
-        $this->view->invoices = Billing::getInvoices();
-    }
-    
-    public function invoiceAction()
-    {
-        Billing::ensureClientIdIsValid();
-        $request = $this->getRequest();
-        $invoice_id = $request->getParam('invoiceid');
-        self::viewInvoice($invoice_id);
-    }
-}
diff --git a/airtime_mvc/application/controllers/LibraryController.php b/airtime_mvc/application/controllers/LibraryController.php
index aefad2114..21543e24e 100644
--- a/airtime_mvc/application/controllers/LibraryController.php
+++ b/airtime_mvc/application/controllers/LibraryController.php
@@ -485,13 +485,6 @@ class LibraryController extends Zend_Controller_Action
 
     public function publishDialogAction() {
         $this->_helper->layout->disableLayout();
-
-
-        if (LIBRETIME_ENABLE_BILLING === true && !Billing::isStationPodcastAllowed()) {
-            $this->renderScript("podcast/featureupgrade-pane.phtml");
-        }
-
-
         //This just spits out publish-dialog.phtml!
     }
 }
diff --git a/airtime_mvc/application/controllers/LoginController.php b/airtime_mvc/application/controllers/LoginController.php
index 8065b637d..c29c0113a 100644
--- a/airtime_mvc/application/controllers/LoginController.php
+++ b/airtime_mvc/application/controllers/LoginController.php
@@ -88,21 +88,6 @@ class LoginController extends Zend_Controller_Action
                     Application_Model_Preference::SetUserLocale($locale);
 
                     $this->_redirect('showbuilder');
-                } elseif (LIBRETIME_ENABLE_WHMCS) {
-                    $email = $form->getValue('username');
-                    $authAdapter = new WHMCS_Auth_Adapter("admin", $email, $password);
-                    $auth = Zend_Auth::getInstance();
-                    $result = $auth->authenticate($authAdapter);
-                    if ($result->isValid()) {
-                        Zend_Session::regenerateId();
-                        //set the user locale in case user changed it in when logging in
-                        Application_Model_Preference::SetUserLocale($locale);
-                        
-                        $this->_redirect('showbuilder');
-                    }
-                    else {
-                        $form = $this->loginError($username);
-                    }
                 } else {
                     $form = $this->loginError($username);
                 }
@@ -175,18 +160,7 @@ class LoginController extends Zend_Controller_Action
                         $form->email->addError($this->view->translate(_("Email could not be sent. Check your mail server settings and ensure it has been configured properly.")));
                     }
                 } else {
-                    if (!LIBRETIME_ENABLE_WHMCS) {
-                    	$form->email->addError($this->view->translate(_("That username or email address could not be found.")));
-                    } else {
-                        $form->email->addError(
-                            $this->view->translate(
-                                sprintf(
-                                    _pro("That username or email address could not be found. If you are the station owner, you should <a href=\"%s\">reset your here</a>."),
-                                    WHMCS_PASSWORD_RESET_URL
-                                )
-                            )
-                        );
-                    }
+                    $form->email->addError($this->view->translate(_("That username or email address could not be found.")));
                 }
             } else { //Form is not valid
                 $form->email->addError($this->view->translate(_("There was a problem with the username or email address you entered.")));
diff --git a/airtime_mvc/application/controllers/PodcastController.php b/airtime_mvc/application/controllers/PodcastController.php
index d826f666b..628baf319 100644
--- a/airtime_mvc/application/controllers/PodcastController.php
+++ b/airtime_mvc/application/controllers/PodcastController.php
@@ -27,15 +27,10 @@ class PodcastController extends Zend_Controller_Action {
      */
     public function stationAction() {
 
-        if (LIBRETIME_ENABLE_BILLING === true && !Billing::isStationPodcastAllowed()) {
-            $this->render("featureupgrade-page");
-            return;
-        }
-
         $stationPodcastId = Application_Model_Preference::getStationPodcastId();
         $podcast = Application_Service_PodcastService::getPodcastById($stationPodcastId);
         $this->view->podcast = json_encode($podcast);
         $this->view->form = new Application_Form_StationPodcast();
     }
 
-}
\ No newline at end of file
+}
diff --git a/airtime_mvc/application/controllers/PreferenceController.php b/airtime_mvc/application/controllers/PreferenceController.php
index 5c1baf132..803c81409 100644
--- a/airtime_mvc/application/controllers/PreferenceController.php
+++ b/airtime_mvc/application/controllers/PreferenceController.php
@@ -71,7 +71,7 @@ class PreferenceController extends Zend_Controller_Action
                 Application_Model_Preference::setTuneinPartnerId($values["tunein_partner_id"]);
 
                 // SoundCloud Preferences
-                if (Billing::isStationPodcastAllowed() && array_key_exists('SoundCloudLicense', $values)) {
+                if (array_key_exists('SoundCloudLicense', $values)) {
                     Application_Model_Preference::setDefaultSoundCloudLicenseType($values["SoundCloudLicense"]);
                     Application_Model_Preference::setDefaultSoundCloudSharingType($values["SoundCloudSharing"]);
                 }
diff --git a/airtime_mvc/application/controllers/ProvisioningController.php b/airtime_mvc/application/controllers/ProvisioningController.php
deleted file mode 100644
index 4bc090ac1..000000000
--- a/airtime_mvc/application/controllers/ProvisioningController.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-
-use Aws\S3\S3Client;
-
-class ProvisioningController extends Zend_Controller_Action
-{
-
-    public function init()
-    {
-    }
-
-    /**
-     *
-     *  The "create action" is in ProvisioningHelper because it needs to have no dependency on Zend,
-     *  since when we bootstrap Zend, we already need the database set up and working (Bootstrap.php is a mess).
-     *
-     */
-
-    /**
-     * Endpoint to change Airtime preferences remotely.
-     * Mainly for use with the dashboard right now.
-     */
-    public function changeAction() {
-        $this->view->layout()->disableLayout();
-        $this->_helper->viewRenderer->setNoRender(true);
-
-        if (!RestAuth::verifyAuth(true, false, $this)) {
-            return;
-        }
-
-        try {
-            // This is hacky and should be genericized
-            if (isset($_POST['station_name'])) {
-                Application_Model_Preference::SetStationName($_POST['station_name']);
-            }
-            if (isset($_POST['description'])) {
-                Application_Model_Preference::SetStationDescription($_POST['description']);
-            }
-            if (isset($_POST['provisioning_status'])) {
-                Application_Model_Preference::setProvisioningStatus($_POST['provisioning_status']);
-            }
-            if (isset($_POST['icecast_pass'])) {
-                Application_Model_Preference::setDefaultIcecastPassword($_POST['icecast_pass']);
-            }
-            if (isset($_POST['bandwidth_limit'])) {
-                Application_Model_Preference::setBandwidthLimit($_POST['bandwidth_limit']);
-            }
-        } catch (Exception $e) {
-            $this->getResponse()
-                ->setHttpResponseCode(400)
-                ->appendBody("ERROR: " . $e->getMessage());
-            Logging::error($e->getMessage());
-            echo $e->getMessage() . PHP_EOL;
-            return;
-        }
-
-        $this->getResponse()
-            ->setHttpResponseCode(200)
-            ->appendBody("OK");
-    }
-
-    /**
-     * Delete the Airtime Pro station's files from Amazon S3
-     *
-     * FIXME: When we deploy this next time, we should ensure that
-     *        this function can only be accessed with POST requests!
-     */
-    public function terminateAction()
-    {
-        $this->view->layout()->disableLayout();
-        $this->_helper->viewRenderer->setNoRender(true);
-
-        if (!RestAuth::verifyAuth(true, false, $this)) {
-            return;
-        }
-        
-        $CC_CONFIG = Config::getConfig();
-
-        foreach ($CC_CONFIG["supportedStorageBackends"] as $storageBackend) {
-            $proxyStorageBackend = new ProxyStorageBackend($storageBackend);
-            $proxyStorageBackend->deleteAllCloudFileObjects();
-        }
-
-        $this->getResponse()
-            ->setHttpResponseCode(200)
-            ->appendBody("OK");
-    }
-
-}
diff --git a/airtime_mvc/application/controllers/ShowbuilderController.php b/airtime_mvc/application/controllers/ShowbuilderController.php
index 5a8067345..82fa27b64 100644
--- a/airtime_mvc/application/controllers/ShowbuilderController.php
+++ b/airtime_mvc/application/controllers/ShowbuilderController.php
@@ -25,7 +25,6 @@ class ShowbuilderController extends Zend_Controller_Action
         //$this->_helper->layout->setLayout("showbuilder");
 
         $this->view->headScript()->appendScript("localStorage.setItem( 'user-type', '$userType' );");
-        $this->view->headScript()->appendScript(Application_Common_GoogleAnalytics::generateGoogleTagManagerDataLayerJavaScript());
 
         $this->view->headLink()->appendStylesheet($baseUrl . 'css/redmond/jquery-ui-1.8.8.custom.css?' . $CC_CONFIG['airtime_version']);
 
diff --git a/airtime_mvc/application/controllers/ThankYouController.php b/airtime_mvc/application/controllers/ThankYouController.php
deleted file mode 100644
index 86a57a54c..000000000
--- a/airtime_mvc/application/controllers/ThankYouController.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-
-class ThankYouController extends Zend_Controller_Action
-{
-    public function indexAction()
-    {
-        //Variable for the template (thank-you/index.phtml)
-        $this->view->stationUrl = Application_Common_HTTPHelper::getStationUrl();
-        $this->view->conversionUrl  = Application_Common_HTTPHelper::getStationUrl() . 'thank-you/confirm-conversion';
-        $this->view->gaEventTrackingJsCode = ""; //Google Analytics event tracking code that logs an event.
-
-        // Embed the Google Analytics conversion tracking code if the
-        // user is a super admin and old plan level is set to trial.
-        if (Application_Common_GoogleAnalytics::didPaidConversionOccur($this->getRequest())) {
-            $this->view->gaEventTrackingJsCode = Application_Common_GoogleAnalytics::generateConversionTrackingJavaScript();
-        }
-
-        $csrf_namespace = new Zend_Session_Namespace('csrf_namespace');
-        $csrf_element = new Zend_Form_Element_Hidden('csrf');
-        $csrf_element->setValue($csrf_namespace->authtoken)->setRequired('true')->removeDecorator('HtmlTag')->removeDecorator('Label');
-        $csrf_form = new Zend_Form();
-        $csrf_form->addElement($csrf_element);
-        $this->view->form = $csrf_form;
-    }
-
-    /** Confirm that a conversion was tracked. */
-    public function confirmConversionAction()
-    {
-        $this->view->layout()->disableLayout();
-        $this->_helper->viewRenderer->setNoRender(true);
-
-        $current_namespace = new Zend_Session_Namespace('csrf_namespace');
-        $observed_csrf_token = $this->_getParam('csrf_token');
-        $expected_csrf_token = $current_namespace->authtoken;
-
-        if($observed_csrf_token != $expected_csrf_token) {
-            Logging::info("Invalid CSRF token");
-            return;
-        }
-
-        if ($this->getRequest()->isPost()) {
-            Logging::info("Goal conversion from trial to paid.");
-            // Clear old plan level so we prevent duplicate events.
-            // This should only be called from AJAX. See thank-you/index.phtml
-            Application_Model_Preference::ClearOldPlanLevel();
-        }
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/application/controllers/WhmcsLoginController.php b/airtime_mvc/application/controllers/WhmcsLoginController.php
deleted file mode 100644
index 92b554de6..000000000
--- a/airtime_mvc/application/controllers/WhmcsLoginController.php
+++ /dev/null
@@ -1,262 +0,0 @@
-<?php
-
-class WhmcsLoginController extends Zend_Controller_Action
-{
-
-    public function init()
-    {
-    }
-    
-    public function indexAction()
-    {
-        $CC_CONFIG = Config::getConfig();
-
-        $request = $this->getRequest();
-        $this->view->layout()->disableLayout();
-        $this->_helper->viewRenderer->setNoRender(true);
-        
-        $username = "admin"; //This is just for appearance in your session. It shows up in the corner of the Airtime UI.
-        $email = $_POST["email"];
-        $password = $_POST["password"];
-                
-        Application_Model_Locale::configureLocalization($request->getcookie('airtime_locale', 'en_CA'));
-        if (Zend_Auth::getInstance()->hasIdentity())
-        {
-            $this->_redirect('showbuilder');
-        }
-        
-        $authAdapter = new WHMCS_Auth_Adapter($username, $email, $password);
-                
-        $auth = Zend_Auth::getInstance();
-        $result = $auth->authenticate($authAdapter);
-        if ($result->isValid()) {
-            //all info about this user from the login table omit only the password
-            //$userInfo = $authAdapter->getResultRowObject(null, 'password');
-        
-            //the default storage is a session with namespace Zend_Auth            
-            /*
-            [id] => 1
-            [login] => admin
-            [pass] => hashed password
-            [type] => A
-            [first_name] =>
-            [last_name] =>
-            [lastlogin] =>
-            [lastfail] =>
-            [skype_contact] =>
-            [jabber_contact] =>
-            [email] => asdfasdf@asdasdf.com
-            [cell_phone] =>
-            [login_attempts] => 0
-            */
-            
-            //Zend_Auth already does this for us, it's not needed:
-            //$authStorage = $auth->getStorage();
-            //$authStorage->write($result->getIdentity()); //$userInfo);
-            
-            //set the user locale in case user changed it in when logging in
-            //$locale = $form->getValue('locale');
-            //Application_Model_Preference::SetUserLocale($locale);
-
-            $this->_redirect('showbuilder');
-        }     
-        else {
-            echo("Sorry, that username or password was incorrect.");
-        } 
-       
-        return;
-    }
-}
-
-class WHMCS_Auth_Adapter implements Zend_Auth_Adapter_Interface {
-    private $username;
-    private $password;
-    private $email;
-
-    function __construct($username, $email, $password) {
-        $this->username = $username;
-        $this->password = $password;
-        $this->email = $email;
-        $this->identity = null;
-    }
-
-    function authenticate() {        
-        list($credentialsValid, $clientId) = $this->validateCredentialsWithWHMCS($this->email, $this->password);
-        if (!$credentialsValid)
-        {
-            return new Zend_Auth_Result(Zend_Auth_Result::FAILURE_CREDENTIAL_INVALID, null);
-        }
-        if (!$this->verifyClientSubdomainOwnership($clientId))
-        {
-            return new Zend_Auth_Result(Zend_Auth_Result::FAILURE_CREDENTIAL_INVALID, null);
-        }
-    
-        $identity = array();
-        
-        //TODO: Get identity of the first admin user!
-        
-        /*
-        $identity["id"] = 1;
-        $identity["type"] = "S";
-        $identity["login"] = $this->username; //admin";
-        $identity["email"] = $this->email;*/
-        $identity = $this->getSuperAdminIdentity();
-        if (is_null($identity)) {
-            Logging::error("No super admin user found");
-            return new Zend_Auth_Result(Zend_Auth_Result::FAILURE, null);
-        }
-        $identity = (object)$identity; //Convert the array into an stdClass object
-        
-        try {
-            return new Zend_Auth_Result(Zend_Auth_Result::SUCCESS, $identity);
-        } catch (Exception $e) {
-            // exception occured
-            return new Zend_Auth_Result(Zend_Auth_Result::FAILURE, null);
-        }
-    }
-    
-    private function getSuperAdminIdentity()
-    {
-        $firstSuperAdminUser = CcSubjsQuery::create()
-        ->filterByDbType('S')
-        ->orderByDbId()
-        ->findOne();
-        if (!$firstSuperAdminUser) {
-            //If there's no super admin users, get the first regular admin user!
-            $firstSuperAdminUser = CcSubjsQuery::create()
-                                ->filterByDbType('A')
-                                ->orderByDbId()
-                                ->findOne();
-            if (!$firstSuperAdminUser) {
-                return null;
-            }
-        }
-        $identity["id"] = $firstSuperAdminUser->getDbId();
-        $identity["type"] = "S"; //Super Admin
-        $identity["login"] = $firstSuperAdminUser->getDbLogin();
-        $identity["email"] = $this->email;
-        return $identity;
-    }
-    
-    //Returns an array! Read the code carefully:
-    private function validateCredentialsWithWHMCS($email, $password)
-    {
-        $client_postfields = array();
-        $client_postfields["username"] = $_SERVER['WHMCS_USERNAME']; //WHMCS API username
-        $client_postfields["password"] = md5($_SERVER['WHMCS_PASSWORD']); //WHMCS API password
-        $client_postfields["action"] ="validatelogin";
-        $client_postfields["responsetype"] = "json";
-        
-        $client_postfields["email"] = $email;
-        $client_postfields["password2"] = $password;
-        
-        $query_string = "";
-        foreach ($client_postfields as $k => $v) $query_string .= "$k=".urlencode($v)."&";
-        
-        $ch = curl_init();
-        curl_setopt($ch, CURLOPT_URL, WHMCS_API_URL);
-        curl_setopt($ch, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4 ); // WHMCS IP whitelist doesn't support IPv6
-        curl_setopt($ch, CURLOPT_POST, 1);
-        curl_setopt($ch, CURLOPT_TIMEOUT, 30);
-        curl_setopt($ch, CURLOPT_FAILONERROR, 1);
-        curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-        curl_setopt($ch, CURLOPT_POSTFIELDS, $query_string);
-        curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0);
-        curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0);
-        $jsondata = curl_exec($ch);
-        if (curl_error($ch)) {
-            Logging::error("Failed to reach WHMCS server in " . __FUNCTION__ . ": "
-                            . curl_errno($ch) . ' - ' . curl_error($ch) . ' - ' . curl_getinfo($ch, CURLINFO_EFFECTIVE_URL));
-            //die("Connection Error: ".curl_errno($ch).' - '.curl_error($ch));
-        }
-        curl_close($ch);
-        
-        $arr = json_decode($jsondata, true); # Decode JSON String
-        
-        if ($arr["result"] != "success") {
-            return array(false, -1);
-        }
-        $clientId = $arr["userid"];
-                
-        return array(true, $clientId);
-    }
-    
-    function verifyClientSubdomainOwnership($clientId)
-    {
-        //Do a quick safety check to ensure the client ID we're authenticating
-        //matches up to the owner of this instance.
-        if ($clientId != Application_Model_Preference::GetClientId())
-        {
-            return false; 
-        }
-        $client_postfields = array();
-        $client_postfields["username"] = $_SERVER['WHMCS_USERNAME'];
-        $client_postfields["password"] = md5($_SERVER['WHMCS_PASSWORD']);
-        $client_postfields["action"] ="getclientsproducts";
-        $client_postfields["responsetype"] = "json";
-    
-        $client_postfields["clientid"] = $clientId;
-        //$client_postfields["stats"] = "true";
-    
-        $query_string = "";
-        foreach ($client_postfields as $k => $v) $query_string .= "$k=".urlencode($v)."&";
-    
-        $ch = curl_init();
-        curl_setopt($ch, CURLOPT_URL, WHMCS_API_URL);
-        curl_setopt($ch, CURLOPT_IPRESOLVE, CURL_IPRESOLVE_V4 ); // WHMCS IP whitelist doesn't support IPv6
-        curl_setopt($ch, CURLOPT_POST, 1);
-        curl_setopt($ch, CURLOPT_TIMEOUT, 30);
-        curl_setopt($ch, CURLOPT_FAILONERROR, 1);
-        curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-        curl_setopt($ch, CURLOPT_POSTFIELDS, $query_string);
-        curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 0);
-        curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0);
-        $jsondata = curl_exec($ch);
-        if (curl_error($ch)) {
-            Logging::error("Failed to reach WHMCS server in " . __FUNCTION__ . ": "
-                            . curl_errno($ch) . ' - ' . curl_error($ch) . ' - ' . curl_getinfo($ch, CURLINFO_EFFECTIVE_URL));
-            //die("Connection Error: ".curl_errno($ch).' - '.curl_error($ch));
-        }
-        curl_close($ch);
-    
-        $arr = json_decode($jsondata, true); # Decode JSON String
-        //$client_id = $arr["clientid"];
-        //print_r($arr);
-        if ($arr["result"] != "success") {
-            die("Sorry, that email address or password was incorrect.");
-        }
-    
-        $doesAirtimeProductExist = false;
-        $isAirtimeAccountSuspended = true;
-        $airtimeProduct = null;
-    
-        foreach ($arr["products"]["product"] as $product)
-        {
-            if (strpos($product["groupname"], "Airtime") === FALSE)
-            {
-                //Ignore non-Airtime products
-                continue;
-            }
-            else
-            {
-                if (($product["status"] === "Active") || ($product["status"] === "Suspended")) {
-                    $airtimeProduct = $product;
-                    $subdomain = '';
-
-                    foreach ($airtimeProduct['customfields']['customfield'] as $customField)
-                    {
-                        if ($customField['name'] === SUBDOMAIN_WHMCS_CUSTOM_FIELD_NAME)
-                        {
-                            $subdomain = $customField['value'];
-                            if (($subdomain . ".airtime.pro") === $_SERVER['SERVER_NAME'])
-                            {
-                                return true;
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        return false;
-    }
-}
diff --git a/airtime_mvc/application/controllers/plugins/Acl_plugin.php b/airtime_mvc/application/controllers/plugins/Acl_plugin.php
index 9f9293434..5a6b5dcc5 100644
--- a/airtime_mvc/application/controllers/plugins/Acl_plugin.php
+++ b/airtime_mvc/application/controllers/plugins/Acl_plugin.php
@@ -118,8 +118,6 @@ class Zend_Controller_Plugin_Acl extends Zend_Controller_Plugin_Abstract
                 "error",
                 "locale",
                 "upgrade",
-                'whmcs-login',
-                "provisioning",
                 "embed",
                 "feeds"
             )))
diff --git a/airtime_mvc/application/controllers/plugins/ConversionTracking.php b/airtime_mvc/application/controllers/plugins/ConversionTracking.php
deleted file mode 100644
index ae0fc2781..000000000
--- a/airtime_mvc/application/controllers/plugins/ConversionTracking.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-class Zend_Controller_Plugin_ConversionTracking extends Zend_Controller_Plugin_Abstract
-{
-    public function preDispatch(Zend_Controller_Request_Abstract $request)
-    {
-        if (!Zend_Session::isStarted()) {
-            return;
-        }
-
-        //If user is a super admin and old plan level is set to trial....
-        if (Application_Common_GoogleAnalytics::didPaidConversionOccur($request))
-        {
-            //Redirect to Thank you page, unless the request was already going there...
-            if ($request->getControllerName() != 'thank-you')
-            {
-                $request->setModuleName('default')
-                    ->setControllerName('thank-you')
-                    ->setActionName('index')
-                    ->setDispatched(true);
-            }
-        }
-    }
-
-}
\ No newline at end of file
diff --git a/airtime_mvc/application/controllers/plugins/PageLayoutInitPlugin.php b/airtime_mvc/application/controllers/plugins/PageLayoutInitPlugin.php
index 05447c8f6..f6a46be5d 100644
--- a/airtime_mvc/application/controllers/plugins/PageLayoutInitPlugin.php
+++ b/airtime_mvc/application/controllers/plugins/PageLayoutInitPlugin.php
@@ -33,8 +33,6 @@ class PageLayoutInitPlugin extends Zend_Controller_Plugin_Abstract
             "auth",
             "error",
             "upgrade",
-            'whmcs-login',
-            "provisioning",
             "embed",
             "feeds"
         ))
@@ -223,29 +221,12 @@ class PageLayoutInitPlugin extends Zend_Controller_Plugin_Abstract
         }
 
         $view->headScript()->appendScript("var userType = '$userType';");
-        if (LIBRETIME_ENABLE_LIVECHAT === true
-            && array_key_exists('REQUEST_URI', $_SERVER) //Doesn't exist for unit tests
-            && strpos($_SERVER['REQUEST_URI'], 'Dashboard/stream-player') === false
-            && strpos($_SERVER['REQUEST_URI'], 'audiopreview') === false
-            && $_SERVER['REQUEST_URI'] != "/") {
-            $plan_level = strval(Application_Model_Preference::GetPlanLevel());
-            // Since the Hobbyist plan doesn't come with Live Chat support, don't enable it
-            if (Application_Model_Preference::GetLiveChatEnabled() && $plan_level !== 'hobbyist') {
-                $client_id = strval(Application_Model_Preference::GetClientId());
-                $station_url = $_SERVER['SERVER_NAME'] . $_SERVER['REQUEST_URI'];
-                $view->headScript()->appendScript("var livechat_client_id = '$client_id';\n" .
-                    "var livechat_plan_type = '$plan_level';\n" .
-                    "var livechat_station_url = 'http://$station_url';");
-                $view->headScript()->appendFile($baseUrl . 'js/airtime/common/livechat.js?' . $CC_CONFIG['airtime_version'], 'text/javascript');
-            }
-        }
     }
 
     protected function _initViewHelpers()
     {
         $view = $this->_bootstrap->getResource('view');
         $view->addHelperPath(APPLICATION_PATH . 'views/helpers', 'Airtime_View_Helper');
-        $view->assign('suspended', (Application_Model_Preference::getProvisioningStatus() == PROVISIONING_STATUS_SUSPENDED));
     }
 
     protected function _initTitle()
diff --git a/airtime_mvc/application/forms/BillingClient.php b/airtime_mvc/application/forms/BillingClient.php
deleted file mode 100644
index de5371082..000000000
--- a/airtime_mvc/application/forms/BillingClient.php
+++ /dev/null
@@ -1,199 +0,0 @@
-<?php
-
-class Application_Form_BillingClient extends Zend_Form
-{
-    public function init()
-    {        
-        /*$this->setDecorators(array(
-                array('ViewScript', array('viewScript' => 'form/billing-purchase.phtml'))));*/
-        $client = Billing::getClientDetails();
-        $this->setAttrib("id", "clientdetails_form");
-        
-        $notEmptyValidator = Application_Form_Helper_ValidationTypes::overrideNotEmptyValidator();
-        $emailValidator = Application_Form_Helper_ValidationTypes::overrideEmailAddressValidator();
-        
-        $firstname = new Zend_Form_Element_Text('firstname');
-        $firstname->setLabel(_pro('First Name:'))
-            ->setValue($client["firstname"])
-            ->setAttrib('class', 'input_text')
-            ->setRequired(true)
-            ->addValidator($notEmptyValidator)
-            ->addFilter('StringTrim');
-        $this->addElement($firstname);
-
-        $lastname = new Zend_Form_Element_Text('lastname');
-        $lastname->setLabel(_pro('Last Name:'))
-            ->setValue($client["lastname"])
-            ->setAttrib('class', 'input_text')
-            ->setRequired(true)
-            ->addValidator($notEmptyValidator)
-            ->addFilter('StringTrim');
-        $this->addElement($lastname);
-
-        $companyname = new Zend_Form_Element_Text('companyname');
-        $companyname->setLabel(_pro('Company Name:'))
-            ->setValue($client["companyname"])
-            ->setAttrib('class', 'input_text')
-            ->setRequired(false)
-            ->addValidator($notEmptyValidator)
-            ->addFilter('StringTrim');
-        $this->addElement($companyname);
-
-        $email = new Zend_Form_Element_Text('email');
-        $email->setLabel(_pro('Email Address:'))
-            ->setValue($client["email"])
-            ->setAttrib('class', 'input_text')
-            ->setRequired(true)
-            ->setAttrib('readonly', 'readonly')
-            ->addValidator($emailValidator)
-            ->addFilter('StringTrim');
-        $this->addElement($email);
-
-        $address1 = new Zend_Form_Element_Text('address1');
-        $address1->setLabel(_pro('Address 1:'))
-            ->setValue($client["address1"])
-            ->setAttrib('class', 'input_text')
-            ->setRequired(true)
-            ->addValidator($notEmptyValidator)
-            ->addFilter('StringTrim');
-        $this->addElement($address1);
-
-        $address2 = new Zend_Form_Element_Text('address2');
-        $address2->setLabel(_pro('Address 2:'))
-            ->setValue($client["address2"])
-            ->setAttrib('class', 'input_text')
-            ->addFilter('StringTrim');
-        $this->addElement($address2);
-
-        $city = new Zend_Form_Element_Text('city');
-        $city->setLabel(_pro('City:'))
-            ->setValue($client["city"])
-            ->setAttrib('class', 'input_text')
-            ->setRequired(true)
-            ->addValidator($notEmptyValidator)
-            ->addFilter('StringTrim');
-        $this->addElement($city);
-
-        //TODO: get list from whmcs?
-        $state = new Zend_Form_Element_Text('state');
-        $state->setLabel(_pro('State/Region:'))
-            ->setValue($client["state"])
-            ->setAttrib('class', 'input_text')
-            ->setRequired(true)
-            ->addValidator($notEmptyValidator)
-            ->addFilter('StringTrim');
-        $this->addElement($state);
-
-        $postcode = new Zend_Form_Element_Text('postcode');
-        $postcode->setLabel(_pro('Zip Code / Postal Code:'))
-            ->setValue($client["postcode"])
-            ->setAttrib('class', 'input_text')
-            ->setRequired(true)
-            ->addValidator($notEmptyValidator)
-            ->addFilter('StringTrim');
-        $this->addElement($postcode);
-
-        $locale = new Zend_Locale('en_US');
-        $countries = $locale->getTranslationList('Territory', 'en', 2);
-        asort($countries, SORT_LOCALE_STRING);
-        
-        $country = new Zend_Form_Element_Select('country');
-        $country->setLabel(_pro('Country:'))
-            ->setValue($client["country"])
-            ->setAttrib('class', 'input_text')
-            ->setMultiOptions($countries)
-            ->setRequired(true)
-            ->addValidator($notEmptyValidator)
-            ->addFilter('StringTrim');
-        $this->addElement($country);
-
-        $phonenumber = new Zend_Form_Element_Text('phonenumber');
-        $phonenumber->setLabel(_pro('Phone Number:'))
-            ->setValue($client["phonenumber"])
-            ->setAttrib('class', 'input_text')
-            ->setRequired(true)
-            ->addValidator($notEmptyValidator)
-            ->addFilter('StringTrim');
-        $this->addElement($phonenumber);
-
-        $securityqid = new Zend_Form_Element_Select('securityqid');
-        $securityqid->setLabel(_pro('Please choose a security question:'))
-            ->setValue($client["securityqid"])
-            ->setAttrib('class', 'input_text')
-            ->setRequired(true)
-            ->setMultiOptions(array(
-                "1" => _("What is the name of your favorite childhood friend?"),
-                "3" => _("What school did you attend for sixth grade?"),
-                "4" => _("In what city did you meet your spouse/significant other?"),
-                "5" => _("What street did you live on in third grade?"),
-                "6" => _("What is the first name of the boy or girl that you first kissed?"),
-                "7" => _("In what city or town was your first job?")));
-        $this->addElement($securityqid);
-
-        $securityqans = new Zend_Form_Element_Text('securityqans');
-        $securityqans->setLabel(_pro('Please enter an answer:'))
-            ->setValue($client["securityqans"])
-            ->setAttrib('class', 'input_text')
-            ->setRequired(true)
-            ->addValidator($notEmptyValidator)
-            ->addFilter('StringTrim');
-        $this->addElement($securityqans);
-
-        foreach ($client["customfields"] as $field) {
-            if ($field["id"] == "7") {
-                $vatvalue = $field["value"];
-            } elseif ($field["id"] == "71") {
-                $subscribevalue = $field["value"];
-            }
-        }
-
-        $vat = new Zend_Form_Element_Text("7");
-        $vat->setLabel(_pro('VAT/Tax ID (EU only)'))
-            ->setBelongsTo('customfields')
-            ->setValue($vatvalue)
-            ->setAttrib('class', 'input_text')
-            //->setRequired(true)
-            //->addValidator($notEmptyValidator)
-            ->addFilter('StringTrim');
-        $this->addElement($vat);
-
-        $subscribe = new Zend_Form_Element_Checkbox('71');
-        $subscribe->setLabel(_pro('Subscribe to Sourcefabric newsletter'))
-            ->setValue($subscribevalue)
-            ->setBelongsTo('customfields')
-            ->setAttrib('class', 'billing-details-checkbox')
-            ->setRequired(true)
-            ->addValidator($notEmptyValidator)
-            ->addFilter('StringTrim');
-        $this->addElement($subscribe);
-
-        $password = new Zend_Form_Element_Password('password2');
-        $password->setLabel(_pro('Password:'));
-        $password->setAttrib('class', 'input_text');
-        $password->setValue("xxxxxx");
-        $password->setRequired(true);
-        $password->addFilter('StringTrim');
-        $password->addValidator($notEmptyValidator);
-        $this->addElement($password);
-
-        $passwordVerify = new Zend_Form_Element_Password('password2verify');
-        $passwordVerify->setLabel(_pro('Verify Password:'));
-        $passwordVerify->setAttrib('class', 'input_text');
-        $passwordVerify->setValue("xxxxxx");
-        $passwordVerify->setRequired(true);
-        $passwordVerify->addFilter('StringTrim');
-        //$passwordVerify->addValidator($notEmptyValidator);
-        $passwordVerify->addValidator('Identical', false, array('token' => 'password2'));
-        $passwordVerify->addValidator($notEmptyValidator);
-        $this->addElement($passwordVerify);
-
-        $this->addElement('hash', 'csrf_client', array(
-            'salt' => 'unique'
-        ));
-
-        $submit = new Zend_Form_Element_Submit("submit");
-        $submit->setIgnore(true)
-                ->setLabel(_pro("Save"));
-        $this->addElement($submit);
-    }
-}
\ No newline at end of file
diff --git a/airtime_mvc/application/forms/BillingUpgradeDowngrade.php b/airtime_mvc/application/forms/BillingUpgradeDowngrade.php
deleted file mode 100644
index f0a37ab8d..000000000
--- a/airtime_mvc/application/forms/BillingUpgradeDowngrade.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-class Application_Form_BillingUpgradeDowngrade extends Zend_Form
-{
-    public function init()
-    {
-        $this->addElement('hash', 'csrf_upgrade', array( //Needs a unique ID (csrf_upgrade) so it doesn't conflict with other tokens in subforms
-            'salt' => 'unique'
-        ));
-
-        $productPrices = array();
-        $productTypes = array();       
-        list($productPrices, $productTypes) = Billing::getProductPricesAndTypes();
-                       
-        $currentPlanProduct = Billing::getClientCurrentAirtimeProduct();
-        $currentPlanProductId = $currentPlanProduct["pid"];
-        
-        $currentPlanProductBillingCycle = $currentPlanProduct["billingcycle"];
-        $pid = new Zend_Form_Element_Radio('newproductid');
-        $pid->setLabel(_('Plan type:'))
-            ->setMultiOptions($productTypes)
-            ->setRequired(true)
-            ->setValue($currentPlanProductId);
-        $this->addElement($pid);       
-        
-        //Logging::info(BillingController::getClientCurrentAirtimeProduct());
-        $billingcycle = new Zend_Form_Element_Radio('newproductbillingcycle');
-        $billingCycleOptionMap = array('monthly' => 'Monthly', 'annually' => 'Annually (Holiday Promo)');
-        if (!array_key_exists($currentPlanProductBillingCycle, $billingCycleOptionMap)) {
-            $currentPlanProductBillingCycle = 'monthly';
-        }
-        $billingcycle->setLabel(_('Billing cycle:'))
-            ->setMultiOptions($billingCycleOptionMap)
-            ->setRequired(true)
-            ->setValue($currentPlanProductBillingCycle);
-            
-        $this->addElement($billingcycle);
-
-        $paymentmethod = new Zend_Form_Element_Radio('paymentmethod');
-        $paymentmethod->setLabel(_('Payment method:'))
-            ->setRequired(true)
-            ->setMultiOptions(array(
-                'paypal' => _('PayPal'),
-                'tco' => _('Credit Card via 2Checkout')))
-            ->setValue('paypal');
-        $this->addElement($paymentmethod);
-        
-        /*$submit = new Zend_Form_Element_Submit("submit");
-        $submit->setIgnore(true)
-                ->setLabel(_("Save"));
-        $this->addElement($submit);*/
-        
-        $client = new Application_Form_BillingClient();
-        $client->removeElement("password2");
-        $client->removeElement("password2verify");
-        $this->addSubForm($client, 'billing_client_info');
-    }
-}
diff --git a/airtime_mvc/application/forms/EditUser.php b/airtime_mvc/application/forms/EditUser.php
index cfe6ca790..e262118ce 100644
--- a/airtime_mvc/application/forms/EditUser.php
+++ b/airtime_mvc/application/forms/EditUser.php
@@ -130,18 +130,6 @@ class Application_Form_EditUser extends Zend_Form
         $timezone->setValue($userTz == $stationTz ? null : $userTz);
         $timezone->setDecorators(array('ViewHelper'));
         $this->addElement($timezone);
-        
-        if (LIBRETIME_ENABLE_BILLING === true && Application_Model_User::getCurrentUser()->isSuperAdmin()) {
-            $elemsToDisable = array($password, $passwordVerify, $email, $firstName, $lastName,
-                                    $cellPhone, $skype, $jabber);
-            foreach ($elemsToDisable as $element) {
-            //$this->_redirect('billing/client');
-                $element->setAttrib('disabled', 'disabled');
-                $element->setAttrib('readonly', 'readonly');
-                $element->setRequired(false);
-            }
-        }
-        
     }
 
     public function validateLogin($p_login, $p_userId) {
diff --git a/airtime_mvc/application/forms/Login.php b/airtime_mvc/application/forms/Login.php
index d9713852a..5e7cfef25 100644
--- a/airtime_mvc/application/forms/Login.php
+++ b/airtime_mvc/application/forms/Login.php
@@ -11,7 +11,7 @@ class Application_Form_Login extends Zend_Form
         $this->setMethod('post');
 
         //If the request comes from an origin we consider safe, we disable the CSRF
-        //token checking ONLY for the login page. We do this to allow logins from WHMCS to work.
+        //token checking ONLY for the login page.
         $request = Zend_Controller_Front::getInstance()->getRequest();
         if ($request) {
             $refererUrl = $request->getHeader('referer');
diff --git a/airtime_mvc/application/layouts/scripts/audio-player.phtml b/airtime_mvc/application/layouts/scripts/audio-player.phtml
index f4ce75a59..c748ea0a8 100644
--- a/airtime_mvc/application/layouts/scripts/audio-player.phtml
+++ b/airtime_mvc/application/layouts/scripts/audio-player.phtml
@@ -5,7 +5,6 @@
     <title><?php echo _("Audio Player")?></title>
     <?php echo $this->headLink() ?>
     <?php echo $this->headScript() ?>
-    <?php echo isset($this->google_analytics)?$this->google_analytics:"" ?>
 </head>
 <body>
 <div id="content"><?php echo $this->layout()->content ?></div>
diff --git a/airtime_mvc/application/layouts/scripts/bare.phtml b/airtime_mvc/application/layouts/scripts/bare.phtml
index 4194f7f78..b260b699f 100644
--- a/airtime_mvc/application/layouts/scripts/bare.phtml
+++ b/airtime_mvc/application/layouts/scripts/bare.phtml
@@ -5,7 +5,6 @@
 	<title></title>
     <?php echo $this->headLink() ?>
     <?php echo $this->headScript() ?>
-    <?php echo isset($this->google_analytics)?$this->google_analytics:"" ?>
 </head>
 <body>
 <div id="content"><?php echo $this->layout()->content ?></div>
diff --git a/airtime_mvc/application/layouts/scripts/layout.phtml b/airtime_mvc/application/layouts/scripts/layout.phtml
index a67970653..e1bc10a7c 100644
--- a/airtime_mvc/application/layouts/scripts/layout.phtml
+++ b/airtime_mvc/application/layouts/scripts/layout.phtml
@@ -5,30 +5,10 @@
     <?php echo $this->headTitle() ?>
 	<?php echo $this->headLink() ?>
 	<?php echo $this->headScript() ?>
-	<?php echo isset($this->google_analytics)?$this->google_analytics:"" ?>
 	<?php $baseUrl = Application_Common_OsPath::getBaseDir(); ?>
 </head>
 <body>
-<?php if (LIBRETIME_ENABLE_GOOGLE_ANALYTICS === true): ?>
-<!-- Google Tag Manager -->
-<noscript><iframe src="//www.googletagmanager.com/ns.html?id=GTM-55N6NH"
-height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
-<script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
-new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
-j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
-'//www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
-})(window,document,'script','dataLayer','GTM-55N6NH');</script>
-<!-- End Google Tag Manager -->
-<?php endif; ?>
-<?php echo $this->partial('partialviews/trialBox.phtml', array("is_trial"=>$this->isTrial(), "trial_remain"=> $this->trialRemaining())) ?>
-
     <div id="Panel" class="sticky">
-    <?php if ($this->suspended && $this->isTrial()) : ?>
-        <?php echo $this->partial('partialviews/suspendedtrial.phtml'); ?>
-    <?php elseif ($this->suspended && !$this->isTrial()) : ?>
-        <?php echo $this->partial('partialviews/suspended.phtml'); ?>
-    <?php else : ?>
-
     <?php echo $this->versionNotify();
             $sss = $this->SourceSwitchStatus();
             $scs = $this->SourceConnectionStatus();
@@ -51,8 +31,6 @@ j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
         parseSwitchStatus(schedulePreLoaded.switch_status);
 
     </script>
-
-    <?php endif; //suspended ?>
 </div>
 
 <div id="media_type_nav"> <!-- class="content-pane" -->
diff --git a/airtime_mvc/application/layouts/scripts/livestream.phtml b/airtime_mvc/application/layouts/scripts/livestream.phtml
index d21c4d92d..d4f5bbe89 100644
--- a/airtime_mvc/application/layouts/scripts/livestream.phtml
+++ b/airtime_mvc/application/layouts/scripts/livestream.phtml
@@ -9,7 +9,6 @@
 	<title><?php echo _("Live stream") ?></title>
     <?php echo $this->headLink() ?>
     <?php echo $this->headScript() ?>
-    <?php echo isset($this->google_analytics)?$this->google_analytics:"" ?>
 </head>
 <body>
 <div id="content"><?php echo $this->layout()->content ?></div>
diff --git a/airtime_mvc/application/layouts/scripts/login.phtml b/airtime_mvc/application/layouts/scripts/login.phtml
index b12f00d34..7ece3d12a 100644
--- a/airtime_mvc/application/layouts/scripts/login.phtml
+++ b/airtime_mvc/application/layouts/scripts/login.phtml
@@ -5,7 +5,6 @@
     <?php echo $this->headTitle() ?>
     <?php echo $this->headLink() ?>
     <?php echo $this->headScript() ?>
-    <?php echo isset($this->google_analytics)?$this->google_analytics:"" ?>
 </head>
 <body>
 
diff --git a/airtime_mvc/application/logging/SentryLogging.php b/airtime_mvc/application/logging/SentryLogging.php
index 06ae7a9cc..a4d33f67b 100644
--- a/airtime_mvc/application/logging/SentryLogging.php
+++ b/airtime_mvc/application/logging/SentryLogging.php
@@ -30,7 +30,7 @@ class SentryLogger
                 //FIXME: This doesn't seem to be working...
                 'processorOptions' => array(
                     'Raven_SanitizeDataProcessor' => array(
-                        'fields_re' => '/(authorization|password|passwd|user_token|secret|WHMCS_|SESSION)/i',
+                        'fields_re' => '/(authorization|password|passwd|user_token|secret|SESSION)/i',
                         'values_re' => '/^(?:\d[ -]*?){13,16}$/'
                     )
                 )
@@ -128,4 +128,4 @@ class SentryLogger
         return $extraData;
     }
 
-}
\ No newline at end of file
+}
diff --git a/airtime_mvc/application/models/Preference.php b/airtime_mvc/application/models/Preference.php
index 14dae59c4..21de12214 100644
--- a/airtime_mvc/application/models/Preference.php
+++ b/airtime_mvc/application/models/Preference.php
@@ -692,8 +692,6 @@ class Application_Model_Preference
         $outputArray['NUM_OF_SCHEDULED_PLAYLISTS'] = Application_Model_Schedule::getSchduledPlaylistCount();
         $outputArray['NUM_OF_PAST_SHOWS'] = Application_Model_ShowInstance::GetShowInstanceCount(gmdate(DEFAULT_TIMESTAMP_FORMAT));
         $outputArray['UNIQUE_ID'] = self::GetUniqueId();
-        $outputArray['SAAS'] = self::GetPlanLevel();
-        $outputArray['TRIAL_END_DATE'] = self::GetTrialEndingDate();
         $outputArray['INSTALL_METHOD'] = self::GetInstallMethod();
         $outputArray['NUM_OF_STREAMS'] = self::GetNumOfStreams();
         $outputArray['STREAM_INFO'] = Application_Model_StreamSetting::getStreamInfoForDataCollection();
@@ -702,9 +700,6 @@ class Application_Model_Preference
 
         $outputString = "\n";
         foreach ($outputArray as $key => $out) {
-            if ($key == 'TRIAL_END_DATE' && ($out != '' || $out != 'NULL')) {
-                continue;
-            }
             if ($key == "STREAM_INFO") {
                 $outputString .= $key." :\n";
                 foreach ($out as $s_info) {
@@ -712,8 +707,6 @@ class Application_Model_Preference
                         $outputString .= "\t".strtoupper($k)." : ".$v."\n";
                     }
                 }
-            } elseif ($key == "SAAS") {
-                $outputString .= $key.' : '.$out."\n";
             } else {
                 $outputString .= $key.' : '.$out."\n";
             }
@@ -828,47 +821,6 @@ class Application_Model_Preference
         return self::getValue("max_bitrate");
     }
 
-    public static function SetPlanLevel($plan)
-    {
-        $oldPlanLevel = self::GetPlanLevel();
-        self::setValue("plan_level", $plan);
-        //We save the old plan level temporarily to facilitate conversion tracking
-        self::setValue("old_plan_level", $oldPlanLevel);
-    }
-
-    public static function GetPlanLevel()
-    {
-        $plan = self::getValue("plan_level");
-        if (trim($plan) == '') {
-            $plan = 'disabled';
-        }
-
-        return $plan;
-    }
-
-    public static function GetOldPlanLevel()
-    {
-        $oldPlan = self::getValue("old_plan_level");
-        return $oldPlan;
-    }
-
-    /** Clearing the old plan level indicates a change in your plan has been tracked (Google Analytics) */
-    public static function ClearOldPlanLevel()
-    {
-        self::setValue("old_plan_level", '');
-    }
-
-
-    public static function SetTrialEndingDate($date)
-    {
-        self::setValue("trial_end_date", $date);
-    }
-
-    public static function GetTrialEndingDate()
-    {
-        return self::getValue("trial_end_date");
-    }
-
     public static function SetEnableStreamConf($bool)
     {
         self::setValue("enable_stream_conf", $bool);
@@ -1009,24 +961,6 @@ class Application_Model_Preference
         }
     }
     
-    public static function GetLiveChatEnabled()
-    {
-        $liveChat = self::getValue("live_chat", false);
-        if (is_null($liveChat) || $liveChat == "" || $liveChat == "1") { //Defaults to on
-            return true;
-        }
-        return false;
-    }
-    
-    public static function SetLiveChatEnabled($toggle)
-    {
-        if (is_bool($toggle)) {
-            self::setValue("live_chat", $toggle ? "1" : "0");
-        } else {
-            Logging::warn("Attempting to set live_chat to invalid value: $toggle. Must be a bool.");
-        }
-    }
-
     /* User specific preferences start */
 
     /**
@@ -1394,18 +1328,6 @@ class Application_Model_Preference
         self::setDiskUsage($currentDiskUsage + $filesize);
     }
 
-
-    public static function setProvisioningStatus($status)
-    {
-        //See constants.php for the list of valid values. eg. PROVISIONING_STATUS_ACTIVE
-        self::setValue("provisioning_status", $status);
-    }
-
-    public static function getProvisioningStatus()
-    {
-        return self::getValue("provisioning_status");
-    }
-
     public static function setTuneinEnabled($value)
     {
         self::setValue("tunein_enabled", $value);
@@ -1633,11 +1555,6 @@ class Application_Model_Preference
      * @return int either 0 (public) or 1 (private)
      */
     public static function getStationPodcastPrivacy() {
-        if (LIBRETIME_ENABLE_BILLING === true && !Billing::isStationPodcastAllowed()) {
-            // return private setting
-            return 1;
-        }
-
         return self::getValue("station_podcast_privacy");
     }
 
diff --git a/airtime_mvc/application/modules/rest/controllers/PodcastController.php b/airtime_mvc/application/modules/rest/controllers/PodcastController.php
index f6f75ba57..3797a51f1 100644
--- a/airtime_mvc/application/modules/rest/controllers/PodcastController.php
+++ b/airtime_mvc/application/modules/rest/controllers/PodcastController.php
@@ -96,11 +96,6 @@ class Rest_PodcastController extends Zend_Rest_Controller
                                                "html"=>$this->view->render($path),
                                            ));
         }
-        catch (PodcastLimitReachedException $e) {
-            $this->getResponse()
-                ->setHttpResponseCode(400)
-                ->appendBody("Podcast limit reached.");
-        }
         catch (InvalidPodcastException $e) {
             $this->getResponse()
                 ->setHttpResponseCode(400)
diff --git a/airtime_mvc/application/services/PodcastService.php b/airtime_mvc/application/services/PodcastService.php
index 587b85498..9d2c8fffb 100644
--- a/airtime_mvc/application/services/PodcastService.php
+++ b/airtime_mvc/application/services/PodcastService.php
@@ -1,6 +1,5 @@
 <?php
 
-class PodcastLimitReachedException extends Exception {}
 
 class InvalidPodcastException extends Exception {}
 
@@ -18,22 +17,6 @@ class Application_Service_PodcastService
         "owner"
     );
 
-    /**
-     * There is maximum of 50 podcasts allowed in the library - to limit
-     * resource consumption. This function returns true if the podcast
-     * limit has been reached.
-     *
-     * @return bool
-     */
-    public static function PodcastLimitReached()
-    {
-        if (PodcastQuery::create()->count() >= 50) {
-            return true;
-        } else {
-            return false;
-        }
-    }
-
     /**
      * Returns parsed rss feed, or false if the given URL cannot be downloaded
      *
@@ -62,14 +45,9 @@ class Application_Service_PodcastService
      * @return array Podcast Array with a full list of episodes
      * @throws Exception
      * @throws InvalidPodcastException
-     * @throws PodcastLimitReachedException
      */
     public static function createFromFeedUrl($feedUrl)
     {
-        if (self::PodcastLimitReached() && LIBRETIME_ENABLE_BILLING) {
-            throw new PodcastLimitReachedException();
-        }
-
         //TODO: why is this so slow?
         $rss = self::getPodcastFeed($feedUrl);
         if (!$rss) {
diff --git a/airtime_mvc/application/views/helpers/IsTrial.php b/airtime_mvc/application/views/helpers/IsTrial.php
deleted file mode 100644
index 743232b33..000000000
--- a/airtime_mvc/application/views/helpers/IsTrial.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-class Airtime_View_Helper_IsTrial extends Zend_View_Helper_Abstract{
-    public function isTrial(){
-        $plan = Application_Model_Preference::GetPlanLevel();
-        return $plan == 'trial';
-    }
-}
diff --git a/airtime_mvc/application/views/helpers/TrialRemaining.php b/airtime_mvc/application/views/helpers/TrialRemaining.php
deleted file mode 100644
index bdbd0caae..000000000
--- a/airtime_mvc/application/views/helpers/TrialRemaining.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-class Airtime_View_Helper_TrialRemaining extends Zend_View_Helper_Abstract
-{
-    public function trialRemaining()
-    {
-        $ending_date = Application_Model_Preference::GetTrialEndingDate();
-        if ($ending_date == '') {
-            return '';
-        }
-        $datetime1 = new DateTime();
-        $datetime2 = new DateTime($ending_date);
-        $interval = $datetime1->diff($datetime2);
-        if($interval->format('%R') == '-'){
-            return "Trial expired.";
-        }
-        return $interval->format('%a');
-    }
-}
diff --git a/airtime_mvc/application/views/scripts/billing/client.phtml b/airtime_mvc/application/views/scripts/billing/client.phtml
deleted file mode 100644
index 8ab4cef31..000000000
--- a/airtime_mvc/application/views/scripts/billing/client.phtml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php 
-$this->form->getElement("submit")->setAttrib("class", "btn right-floated");
-$this->form->getElement("country")->setAttrib("class", "right-align");
-$this->form->getElement("securityqid")->setAttrib("class", "right-align");
-?>
-<div class="ui-widget prefpanel simple-formblock clearfix padded-strong">
-<H2>Billing Account Details</H2>
-<?php if (isset($this->errorMessage)) {?>
-<div class="errors"><?php echo $this->errorMessage ?></div>
-<?php } else if (isset($this->successMessage)) {?>
-<div class="success"><?php echo $this->successMessage ?></div>
-<?php }?>
-
-<?php echo $this->form ?>
-</div>
\ No newline at end of file
diff --git a/airtime_mvc/application/views/scripts/billing/index.phtml b/airtime_mvc/application/views/scripts/billing/index.phtml
deleted file mode 100644
index 30d74d258..000000000
--- a/airtime_mvc/application/views/scripts/billing/index.phtml
+++ /dev/null
@@ -1 +0,0 @@
-test
\ No newline at end of file
diff --git a/airtime_mvc/application/views/scripts/billing/invoice.phtml b/airtime_mvc/application/views/scripts/billing/invoice.phtml
deleted file mode 100644
index e69de29bb..000000000
diff --git a/airtime_mvc/application/views/scripts/billing/invoices.phtml b/airtime_mvc/application/views/scripts/billing/invoices.phtml
deleted file mode 100644
index 7fc3f4e01..000000000
--- a/airtime_mvc/application/views/scripts/billing/invoices.phtml
+++ /dev/null
@@ -1,34 +0,0 @@
-<div class="ui-widget prefpanel clearfix padded-strong billing-panel">
-<H2>Invoices</H2>
-<?php 
-$topTextClass = "";
-if (array_key_exists("planupdated", $_GET))
-{
-    $topText = _pro("<b>Thank you!</b> Your plan has been updated and you will be invoiced during your next billing cycle.");
-    $topTextClass = "invoice-status-good";
-}
-else {
-    $topText = _pro("Tip: To pay an invoice, click \"View Invoice\" and look for the \"Checkout\" button.");
-}
-    
-?>
-<p class="<?=$topTextClass?>"><?=$topText?></p>
-<table id="invoices_table">
-    <tr class="header">
-        <th>Date Issued</th>
-        <th>Due Date</th>
-        <th>Link</th>
-        <th>Status</th>
-    </tr>
-<?php
-foreach ($this->invoices as $invoice) {?>
-    <tr>
-        <td><?php echo $invoice["date"]?></td>
-        <td><?php echo $invoice["duedate"]?></td>
-        <td><a href="invoice?invoiceid=<?php echo $invoice["id"]?>">View Invoice</a></td>
-        <td class="<?=$invoice["status"]==="Unpaid" ? "unpaid" : "";?>"><?php echo $invoice["status"]?></td>
-    </tr>
-    
-<?php };?>
-</table>
-</div>
diff --git a/airtime_mvc/application/views/scripts/billing/upgrade.phtml b/airtime_mvc/application/views/scripts/billing/upgrade.phtml
deleted file mode 100644
index 0174b7213..000000000
--- a/airtime_mvc/application/views/scripts/billing/upgrade.phtml
+++ /dev/null
@@ -1,445 +0,0 @@
-<?php 
-    $form = $this->form;
-    $form->setAttrib('id', 'upgrade-downgrade');
-
-?>
-<script type="text/javascript">
-<?php echo("var products = " . json_encode(Billing::getProducts()) . ";\n");
-      echo("var vatRate = " . json_encode(VAT_RATE) . ";");
-?>
-
-var vatFieldId = "#customfields-7";
-var validVATNumber = false;
-var customerInEU = false;
-
-//Disable annual billing for hobbyist plan
-function validatePlan()
-{
-	if ($("#newproductid-25").is(":checked")) {
-		$("#newproductbillingcycle-monthly").attr("checked", "true");
-		//It's import that we switch the checked item first (because you can't disable a checked radio button in Chrome)
-		$("#newproductbillingcycle-annually").attr("disabled", "disabled");
-		$("label[for='newproductbillingcycle-annually']").addClass("disabled");
-	} else {
-		$("#newproductbillingcycle-annually").removeAttr("disabled");
-		$("label[for='newproductbillingcycle-annually']").removeClass("disabled");
-	}
-}
-
-function validateVATNumber()
-{
-    if ($(vatFieldId).val() == '') {
-        return;
-    }
-    
-	$.post("/billing/vat-validator", { "vatnumber" : $(vatFieldId).val(), "country" : $("#country").val() })
-		.success(function(data, textStatus, jqXHR) {
-    	if (data["result"]) {
-        	$("#vaterror").html("&#10003; Your VAT number is valid.");
-        	window.validVATNumber = true;
-    	} else {
-        	$("#vaterror").text("Error: Your VAT number is invalid.");
-        	window.validVATNumber = false;
-    	}
-    	recalculateTotals();
-	});
-	
-}
-
-/* Recalculate subtotal and total */
-function recalculateTotals()
-{
-	var newProductId = $("input[type='radio'][name='newproductid']:checked");
-	if (newProductId.length > 0) {
-	    newProductId = newProductId.val();
-	} else {
-		return;
-	}
-
-	var newProduct = null;  
-	for (var i = 0; i < products.length; i++)
-	{
-		if (products[i].pid == newProductId) {
-			newProduct = products[i];
-			break;
-		}
-	}
-
-	/** This calculation is all done on the server side too inside WHMCS so don't waste your time
-	    trying to hax0r it to get cheap Airtime Pro. */
-	var subtotal = "0";
-	var savings = "0";
-	var subtotalNumber = "0";
-	var billingPeriodString = "";
-	if ($("#newproductbillingcycle-monthly").is(":checked")) {
-		billingPeriodString = " per month";
-		subtotalNumber = newProduct.pricing["USD"]["monthly"];
-		subtotal = "$" + subtotalNumber + billingPeriodString;
-		$("#savings").text("");
-	    
-	} else if ($("#newproductbillingcycle-annually").is(":checked")) {
-		subtotalNumber = newProduct.pricing["USD"]["annually"];
-		billingPeriodString = " per year";
-		subtotal = "$" + subtotalNumber + billingPeriodString;
-				savings = "$" + (newProduct.pricing["USD"]["monthly"]*12 - subtotalNumber).toFixed(2);
-		$("#savings").html("You save: " + savings + " per year");
-	}
-	$("#subtotal").text(subtotal);
-
-	//Calculate total:
-	var vatAmount = 0; 
-	if (window.customerInEU && !window.validVATNumber) {
-		vatAmount = (parseFloat(subtotalNumber) * vatRate)/100.00;
-	}
-	var total = (vatAmount + parseFloat(subtotalNumber)).toFixed(2);
-	$(".subtotal").text(subtotal);
-	if (vatAmount > 0) {
-		$("#tax").text("Plus VAT at " + parseInt(vatRate) + "%: $" + vatAmount.toFixed(2) + billingPeriodString);
-	} else {
-		$("#tax").text("");
-	}
-	$("#total").text("$" + total + billingPeriodString);
-}
-
-function configureByCountry(countryCode)
-{
-	//Disable the VAT tax field if the country is not in the EU.
-	$.post("/billing/is-country-in-eu", { "country" : countryCode })
-	.success(function(data, textStatus, jqXHR) {
-    	if (data["result"]) {
-    		   $(vatFieldId).prop("disabled", false);
-           	   $(vatFieldId).prop("readonly", false);
-    		   $(vatFieldId + "-label").removeClass("disabled");
-    		   $("#vat_disclaimer2").fadeIn(300);
-    		   window.customerInEU = true;
-    	} else {
-        	$(vatFieldId).prop("disabled", true);
-        	$(vatFieldId).prop("readonly", true);
-        	$(vatFieldId).val("");
- 		    $(vatFieldId + "-label").addClass("disabled");
- 		    $("#vat_disclaimer2").fadeOut(0);
- 		    window.customerInEU = false;
-    	}
-		recalculateTotals();
-	});
-}
-
-$(document).ready(function() {
-	
-	configureByCountry($("#country").val());
-	recalculateTotals();
-
-    $("input[name='newproductid']").change(function() {
-        validatePlan();
-        recalculateTotals();
-    });
-    $("input[name='newproductbillingcycle']").change(function() {
-    	recalculateTotals();
-    });
-
-    $("#country").change(function() {
-        configureByCountry($(this).val());
-    });
-
-    vatFieldChangeTimer = null;
-    $(vatFieldId).change(function() {
-		$("#vaterror").text("Please wait, checking VAT number...");
-        
-    	if (vatFieldChangeTimer) {
-    		clearTimeout(vatFieldChangeTimer);
-        }
-        
-        if ($(this).val() == "") {
-            $("#vaterror").text("");
-            window.validVATNumber = false;
-            recalculateTotals();
-            return;
-        }
-    	vatFieldChangeTimer = setTimeout(function() {
-        	validateVATNumber(); //Validate and recalculate the totals
-    	}, 1500); //Wait 1.5 seconds before validating the VAT number
-    });
-
-    //We don't assume the VAT number we have in the database is valid.
-    //Let's force it to be rechecked and the total to be recalculated when the page loads.
-    validateVATNumber(); 
-
-    $("#hobbyist_grid_price").text("$" + products[0].pricing["USD"]["monthly"] + " / month");
-    $("#starter_grid_price").text("$" + products[1].pricing["USD"]["monthly"] + " / month");
-    $("#plus_grid_price").text("$" + products[2].pricing["USD"]["monthly"] + " / month");
-    $("#premium_grid_price").text("$" + products[3].pricing["USD"]["monthly"] + " / month");
-});
-</script>
-
-<div class="ui-widget prefpanel clearfix padded-strong billing-panel">
-
-    <!--
-    <H2><?=_pro("Account Plans")?></H2>
-    <H4><?=_pro("Upgrade today to get more listeners and storage space!")?></H4>
-    -->
-
-<div class="ui-widget prefpanel clearfix padded-strong billing-panel">
-<H2><?=_pro("Monthly Plans")?></H2>
-<div class="pricing-grid">
-    <table>
-        <tr>
-            <th>Hobbyist</th>
-            <th>Starter</th>
-            <th>Plus</th>
-            <th>Premium</th>
-        </tr>
-        <tr>
-            <td>1 Stream
-            </td>
-            <td>2 Streams
-            </td>
-            <td>2 Streams
-            </td>
-            <td class="last-column">3 Streams
-            </td>
-        </tr> 
-        <tr>
-            <td>Up to 64kbps Stream Quality
-            </td>
-            <td>Up to 128kbps Stream Quality
-            </td>
-            <td>Up to 196kbps Stream Quality
-            </td>
-            <td class="last-column">Up to 196kbps Stream Quality
-            </td>
-        </tr> 
-        <tr>
-            <td>5 Listeners
-            </td>
-            <td>40 Listeners per stream
-            </td>
-            <td>100 Listeners per stream
-            </td>
-            <td class="last-column">500 Listeners per stream
-            </td>
-        </tr>
-        <tr>
-            <td>1 TB Bandwidth</td>
-            <td><span>3 TB Bandwidth</span></td>
-            <td><span>10 TB Bandwidth</span></td>
-            <td><span>40 TB Bandwidth</span></td>
-        </tr>
-        <tr>
-            <td>2GB Storage
-            </td>
-            <td>5GB Storage
-            </td>
-            <td>30GB Storage
-            </td>
-            <td class="last-column">
-                150GB Storage
-            </td>
-        </tr>
-        <tr>
-            <td>No Built-in Podcast
-            </td>
-            <td>2,000 Podcast Episode Downloads
-            </td>
-            <td>5,000 Podcast Episode Downloads
-            </td>
-            <td class="last-column">
-                10,000 Podcast Episode Downloads
-            </td>
-        </tr>
-        <tr>
-            <td>Ticket, Email, Forum Support
-            </td>
-            <td>Live Chat, Ticket, Email, Forum Support
-            </td>
-            <td>Live Chat, Ticket, Email, Forum Support
-            </td>
-            <td class="last-column">Live Chat, Ticket, Email, Forum Support
-            </td>
-        </tr> 
-        <tr>
-            <td>
-            </td>
-            <td>Save 15% if paid annually
-            </td>
-            <td>Save 15% if paid annually
-            </td>
-            <td class="last-column">Save 15% if paid annually
-            </td>
-        </tr> 
-        <tr class="price last-row">
-            <td id="hobbyist_grid_price">
-            </td>
-            <td id="starter_grid_price">
-            </td>
-            <td id="plus_grid_price">
-            </td>
-            <td class="last-column" id="premium_grid_price">
-            </td>
-        </tr>
-    </table>
-</div>
-<div class="pricing-grid">
-    <h2 style="margin-top: 20px">Annual Plans - Special Holiday Promo</h2>
-    <h4>Sign up for an annual plan before December 21st to get a plan above plus a holiday bonus:</h4>
-    <table class="pricing-grid">
-        <tr>
-            <th></th>
-            <th>Starter</th>
-            <th>Plus</th>
-            <th>Premium</th>
-        </tr>
-        <tr>
-            <td></td>
-            <td><span class="promo-text-highlight">800 Listeners per stream</span>
-
-            </td>
-            <td style="padding: 6px"><span class="promo-text-highlight">2000 Listeners per stream</span>
-
-            </td>
-            <td class="last-column"><span class="promo-text-highlight">Unlimited listeners</span>
-            </td>
-        </tr>
-        <tr class="price last-row">
-            <td></td>
-            <td id="">$33.95 / month<br>Billed Annually
-            </td>
-            <td id="">$54.95 / month<br>Billed Annually
-            </td>
-            <td class="last-column" id="">$83.95 / month<br>Billed Annually
-            </td>
-        </tr>
-
-
-    </table>
-</div>
-<!-- 
-<p> <a target="_blank" href="https://www.airtime.pro/pricing"><?=_pro("View Plans")?></a> (Opens in a new window)</p>
- -->
-<p id="current_plan"><span><?php echo(_pro('Your Current Plan:')); ?></span>
-<?php 
-$currentProduct = Billing::getClientCurrentAirtimeProduct();
-echo($currentProduct["name"]);
-//echo Application_Model_Preference::GetPlanLevel();
-?>
-</p>
-    <!--
-    <div class="educational-discount">
-        <h4>Are you a student or educator?</h4>
-        <p>Sign up on an annual plan before the end of October to receive a special educational discount. <a href="https://www.airtime.pro/educational-discount">Find out more</a>.</p>
-    </div>
-    -->
-
-<h3><?php echo(_pro('Choose a plan: ')); ?></h3>
- <form id="<?php echo $form->getId(); ?>" method="<?php echo $form->getMethod() ?>" action="<?php echo
-    $form->getAction()?>" enctype="<?php echo $form->getEncType();?>">
-
-     <?php echo $form->csrf_upgrade ?>
-    
-    <div id="plantype">
-        <?php echo $form->newproductid ?>
-    </div>
-    <div id="billingcycle">
-        <?php echo $form->newproductbillingcycle ?>
-    </div>
-    <div id="billingcycle_disclaimer">
-        Save 15% on annual plans (Hobbyist plan excluded).
-    </div>
-    <div class="clearfix"></div>
-    <div id="subtotal_box">
-        <b>Subtotal:</b><br>
-        <span class="subtotal"></span><br>
-        <div id="savings"></div>
-    </div>
-    
-    <div id="vat_disclaimer">
-    VAT will be added below if you are an EU resident without a valid VAT number.
-    </div>
-    
-    <h3><?=_pro("Please enter your payment details:");?></h3>
-    <?php if (isset($this->errorMessage)) {?>
-    <div class="errors"><?php echo $this->errorMessage ?></div>
-    <?php }?>
-    <?php //echo $form ?>
-    
-    <?php $billingForm = $form->getSubform("billing_client_info") ?>
-    <div class="billing_col1">
-        <?=$billingForm->firstname?>
-    </div>
-    <div class="billing_col2">
-        <?=$billingForm->lastname?>
-    </div>
-    <div class="clearfix"></div>
-    <div class="billing_col1">
-        <?=$billingForm->companyname?>
-    </div>        
-    <div class="billing_col2">
-        <?=$billingForm->email?>
-    </div>        
-    <div class="clearfix"></div>
-    <div class="billing_col1">
-        <?=$billingForm->address1?>
-    </div>        
-    <div class="billing_col2">
-        <?=$billingForm->address2?>
-    </div>      
-    <div class="clearfix"></div>
-    <div class="billing_col1">
-        <?=$billingForm->city?>
-    </div>        
-    <div class="billing_col2">
-        <?=$billingForm->state?>
-    </div>   
-    <div class="clearfix"></div>
-    <div>
-        <?=$billingForm->postcode?>
-    </div>        
-    <div>
-        <?=$billingForm->country?>
-    </div>    
-    <div>
-        <?=$billingForm->phonenumber?>
-    </div>        
-    <div>
-        <?=$billingForm->securityqid?>
-    </div>
-    <div>
-        <?=$billingForm->securityqans?>
-    </div>
-    <div id="vat_disclaimer2"><p>VAT will be added to your invoice if you are an EU resident without a valid company VAT number.</p>
-    </div>
-    <div>
-        <?=$billingForm->getElement("7"); ?>
-        <div id="vaterror"></div>
-    </div>
-    <div class="clearfix"></div>
-     <?php echo $billingForm->csrf_client ?>
-
-     <div>
-    <div class="billing_checkbox">
-            <?=$billingForm->getElement("71")->renderViewHelper(); ?>
-        </div>
-        <?=$billingForm->getElement("71")->renderLabel(); ?>
-    </div>
-    <div class="clearfix"></div>
-    
-    <div style="float:right; width: 200px;"><p>After submitting your order, you will be redirected to an invoice with payment buttons.</p>
-    </div>
-    <div id="paymentmethod">
-        <?php echo $form->paymentmethod ?>
-    </div>
-     <!-- PayPal Logo --><table border="0" cellpadding="10" cellspacing="0"><tr><td></td></tr><tr><td align="center"><img src="https://www.paypalobjects.com/webstatic/en_CA/mktg/logo-image/bdg_secured_by_pp_2line.png" border="0" alt="Secured by PayPal"></td></tr></table><!-- PayPal Logo -->
-     <div>
-     <img src="https://www.2checkout.com/upload/images/paymentlogoshorizontal.png" alt="2Checkout.com is a worldwide leader in online payment services" />
-     </div>
-    
-    <div class="clearfix"></div>
-    <div id="total_box">
-        <b>Subtotal:</b> <span class="subtotal"></span><br>
-        <span id="tax"></span><br>
-        <b>Total:</b> <span id="total"></span>
-    </div>
-    
-    <input type="submit" class="btn right-floated" value="Submit Order" id="atpro_submitorder">
-    <div class="clearfix"></div>
-</form>
-</div>
\ No newline at end of file
diff --git a/airtime_mvc/application/views/scripts/form/edit-user.phtml b/airtime_mvc/application/views/scripts/form/edit-user.phtml
index cff096136..17abf221d 100644
--- a/airtime_mvc/application/views/scripts/form/edit-user.phtml
+++ b/airtime_mvc/application/views/scripts/form/edit-user.phtml
@@ -1,16 +1,6 @@
 <h2><?php echo _("My Profile") ?></h2>
 <div id="current-user-container">
 
-  <?php if(LIBRETIME_ENABLE_BILLING === true && Application_Model_User::getCurrentUser()->isSuperAdmin()) : ?>
-    <div id="user_details_superadmin_message">
-        <p class="alert alert-error">
-            <?=sprintf(_("<b>Note:</b> Since you're the station owner, your account information can be edited in <a href=\"%s\">Billing Settings</a> instead."), "/billing/client");?>
-        </p>
-        <br><br>
-    </div>
-  <?php endif; ?>
-
-
 <form id="current-user-form" class="edit-user-global" method="post" enctype="application/x-www-form-urlencoded">
     <dl class="zend_form">
         <?php echo $this->element->getElement('cu_user_id') ?>
diff --git a/airtime_mvc/application/views/scripts/form/password-restore.phtml b/airtime_mvc/application/views/scripts/form/password-restore.phtml
index 809ba4120..33d6fa7f2 100644
--- a/airtime_mvc/application/views/scripts/form/password-restore.phtml
+++ b/airtime_mvc/application/views/scripts/form/password-restore.phtml
@@ -1,16 +1,4 @@
-<?php if (LIBRETIME_ENABLE_WHMCS): ?>
 <fieldset>
-    <legend>Station Owners</legend>
-    <p>
-        <?php echo(sprintf(_pro("If you are the primary owner of this station, <a href=\"%s\">please reset your password here</a>."), WHMCS_PASSWORD_RESET_URL)); ?>
-    </p>
-
-</fieldset>
-<?php endif; ?>
-<fieldset>
-    <?php if (LIBRETIME_ENABLE_WHMCS): ?>
-    <legend>DJs, Program Managers, and Others</legend>
-    <?php endif; ?>
     <form enctype="application/x-www-form-urlencoded" method="post" action="">
         <dl class="zend_form">
 
diff --git a/airtime_mvc/application/views/scripts/form/preferences.phtml b/airtime_mvc/application/views/scripts/form/preferences.phtml
index ad3aa1d6b..f6ca43ae2 100644
--- a/airtime_mvc/application/views/scripts/form/preferences.phtml
+++ b/airtime_mvc/application/views/scripts/form/preferences.phtml
@@ -8,15 +8,6 @@
         <?php echo $this->element->getSubform('preferences_tunein') ?>
     </div>
 
-    <?php
-    if (LIBRETIME_ENABLE_BILLING === true && Billing::isStationPodcastAllowed()) { ?>
-    <h3 class="collapsible-header" id="soundcloud-heading"><span class="arrow-icon"></span><?php echo _("SoundCloud Settings") ?></h3>
-    <div class="collapsible-content" id="soundcloud-settings">
-        <?php echo $this->element->getSubform('preferences_soundcloud') ?>
-
-    </div>
-    <?php } ?>
-
     <!-- Hide the 'dangerous settings' by default -->
     <h3 class="collapsible-header closed" id="dangerous-heading"><span class="arrow-icon"></span><?php echo _("Dangerous Options") ?></h3>
     <div class="collapsible-content" id="dangerous-settings" style="display:none;">
diff --git a/airtime_mvc/application/views/scripts/partialviews/suspended.phtml b/airtime_mvc/application/views/scripts/partialviews/suspended.phtml
deleted file mode 100644
index 757b3e40b..000000000
--- a/airtime_mvc/application/views/scripts/partialviews/suspended.phtml
+++ /dev/null
@@ -1,9 +0,0 @@
-<div class="suspension_notice">
-    <H2>Station Suspended</H2>
-   <p>
-       <?php echo(_pro(sprintf('Your station is suspended due to an <b>unpaid invoice</b>. To restore your station, <a href="%s">please pay any overdue invoices</a>.', '/billing/invoices'))); ?>
-    </p>
-    <p>
-        <?php echo(_pro(sprintf('Suspended stations will be <b>removed</b> if an invoice is unpaid for 30 days. If you believe this suspension was in error, <a href="%s">please contact support</a>.', 'https://sourcefabricberlin.zendesk.com/anonymous_requests/new'))); ?>
-    </p>
-</div>
\ No newline at end of file
diff --git a/airtime_mvc/application/views/scripts/partialviews/suspendedtrial.phtml b/airtime_mvc/application/views/scripts/partialviews/suspendedtrial.phtml
deleted file mode 100644
index bafce3743..000000000
--- a/airtime_mvc/application/views/scripts/partialviews/suspendedtrial.phtml
+++ /dev/null
@@ -1,9 +0,0 @@
-<div class="suspension_notice">
-    <H2>Station Suspended</H2>
-    <p>
-        <?php echo(_pro(sprintf('Your free trial is now over. To restore your station, <a href="%s">please upgrade your plan now</a>.', '/billing/upgrade'))); ?>
-    </p>
-    <p>
-        <?php echo(_pro(sprintf('Your station will be <b>removed</b> within 7 days if you do not upgrade. If you believe this suspension was in error, <a href="%s">please contact support</a>.', 'https://sourcefabricberlin.zendesk.com/anonymous_requests/new'))); ?>
-    </p>
-</div>
\ No newline at end of file
diff --git a/airtime_mvc/application/views/scripts/partialviews/trialBox.phtml b/airtime_mvc/application/views/scripts/partialviews/trialBox.phtml
deleted file mode 100644
index 7c7f7b7c9..000000000
--- a/airtime_mvc/application/views/scripts/partialviews/trialBox.phtml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php if($this->is_trial && $this->trial_remain != '' && $this->trial_remain != "Trial expired."){?>
-  <div class="trial-box">
-      <p><?php echo _("Your trial expires in") ?></p>
-      <div class="trial-box-calendar">
-           <span class="trial-box-calendar-white"><?php echo $this->trial_remain?></span>
-           <div class="trial-box-calendar-gray"><?php echo _("days") ?></div>
-      </div>
-      <div class="trial-box-button">
-            <a title="<?php echo sprintf(_pro("Purchase an %s plan!"), SAAS_PRODUCT_BRANDING_NAME)?>" href="<?php echo Application_Common_OsPath::getBaseDir() . 'billing/upgrade' ?>"><?php echo _pro("My Account") ?></a>
-      </div>
-  </div>
-<?php }?> 
diff --git a/airtime_mvc/application/views/scripts/plupload/index.phtml b/airtime_mvc/application/views/scripts/plupload/index.phtml
index 0af1d63b7..bdf6a485e 100644
--- a/airtime_mvc/application/views/scripts/plupload/index.phtml
+++ b/airtime_mvc/application/views/scripts/plupload/index.phtml
@@ -6,21 +6,6 @@
 <script type="text/javascript">
     var LIBRETIME_PLUPLOAD_MAX_FILE_SIZE = "<?php echo $this->uploadMaxSize; ?>";
 </script>
-<?php $upgradeLink = Application_Common_OsPath::getBaseDir() . "billing/upgrade"; ?>
-<?php if ($this->quotaLimitReached) { ?>
-    <div class="errors quota-reached">
-    <?php printf(_pro("Disk quota exceeded. You cannot upload files until you %s upgrade your storage"),
-        "<a target=\"_parent\" href=$upgradeLink>");?></a>.
-    </div>
-<?php 
-}
-?>
-<!--
-<form id="plupload_form" <?php if ($this->quotaLimitReached) { ?> class="hidden" <?php } ?>>
-    <?php echo $this->form->getElement('csrf') ?>
-    <div id="plupload_files"></div>	
-</form>
--->
 <div id="upload_form" class="lib-content ui-widget ui-widget-content block-shadow padded content-pane wide-panel<?php if ($this->quotaLimitReached) { ?> hidden <?php } ?>">
     <?php
     $partitions = Application_Model_Systemstatus::GetDiskInfo();
@@ -75,4 +60,4 @@
                cellpadding="0" cellspacing="0"></table>
     </div>
     <div style="clear: both;"></div>
-</div>
\ No newline at end of file
+</div>
diff --git a/airtime_mvc/application/views/scripts/podcast/featureupgrade.phtml b/airtime_mvc/application/views/scripts/podcast/featureupgrade.phtml
deleted file mode 100644
index 492e4bc9a..000000000
--- a/airtime_mvc/application/views/scripts/podcast/featureupgrade.phtml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/**
- * Created by PhpStorm.
- * User: asantoni
- * Date: 17/11/15
- * Time: 2:32 PM
- */
-?>
-
-<div id="upgrade-feature-locked">
-    <h2>Get a built-in podcast for your radio station.</h2>
-    <h3>Upgrade to unlock this feature today. Podcast hosting is included on all Starter, Plus, and Premium plans.</h3>
-
-<p>With our built-in podcast, you can:
-        <ul>
-            <li>Share your own uploads through your podcast feed for on-demand listening.</li>
-            <li>Invite your fans to listen to your podcast on your Radio Page.</li>
-            <li>Publish tracks to both SoundCloud and your station podcast with one click.</li>
-            <li>Reach more listeners, both offline and mobile with your radio podcast.</li>
-    </ul>
-    </p>
-
-    <a href="<?php echo(Application_Common_HTTPHelper::getStationUrl() . "billing/upgrade");?>" class="upgrade-cta-button">Upgrade today!</a>
-</div>
-
-
diff --git a/airtime_mvc/application/views/scripts/thank-you/index.phtml b/airtime_mvc/application/views/scripts/thank-you/index.phtml
deleted file mode 100644
index 436b9b378..000000000
--- a/airtime_mvc/application/views/scripts/thank-you/index.phtml
+++ /dev/null
@@ -1,20 +0,0 @@
-<script type="text/javascript">
-    $(document).ready(function() {
-        <?php if ($this->gaEventTrackingJsCode != "") {
-            echo($this->gaEventTrackingJsCode);
-        ?>
-        jQuery.post("<?=$this->conversionUrl?>", { "csrf_token" : $("#csrf").attr('value')},
-            function( data ) {});
-        <?php }; //endif ?>
-    });
-</script>
-<?php echo $this->form->getElement('csrf') ?>
-
-<div class="ui-widget ui-widget-content block-shadow clearfix padded-strong thankyou-panel">
-    <center>
-        <div class="logobox" style="margin-left: 32px;"></div>
-        <h2><?php echo _pro("Thank you!")?></h2>
-        <h3><?php echo _pro("Your station has been upgraded successfully.")?></h3>
-        <p><a href="<?=$this->stationUrl?>"><?php echo _pro("Return to Airtime")?></a></p>
-    </center>
-</div>
diff --git a/airtime_mvc/application/views/scripts/user/add-user.phtml b/airtime_mvc/application/views/scripts/user/add-user.phtml
index b58294cb5..f193c6252 100644
--- a/airtime_mvc/application/views/scripts/user/add-user.phtml
+++ b/airtime_mvc/application/views/scripts/user/add-user.phtml
@@ -26,11 +26,6 @@
             </table>
         </div>
     </div>
-    <?php if (LIBRETIME_ENABLE_BILLING === true) { ?>
-    <div class="user-data" id="user_details_superadmin_message" style="display: none; margin-top: 105px; text-align: center;">
-        <?=sprintf(_("Super Admin details can be changed in your <a href=\"%s\">Billing Settings</a>."), "/billing/client");?>
-    </div>
-    <?php } ?>
     <div class="user-data simple-formblock" id="user_details">
         <?php echo $this->successMessage ?>
         <fieldset class="padded">
diff --git a/airtime_mvc/locale/ast/LC_MESSAGES/airtime.po b/airtime_mvc/locale/ast/LC_MESSAGES/airtime.po
index 8ec8c5bfb..78ee802be 100644
--- a/airtime_mvc/locale/ast/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/ast/LC_MESSAGES/airtime.po
@@ -701,26 +701,6 @@ msgstr ""
 msgid "Listener Stats"
 msgstr ""
 
-#: airtime_mvc/application/configs/navigation.php:144
-msgid "Upgrade"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:144
-msgid "Billing"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:151
-msgid "Account Plans"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:158
-msgid "Account Details"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:165
-msgid "View Invoices"
-msgstr ""
-
 #: airtime_mvc/application/configs/navigation.php:175
 #: airtime_mvc/application/views/scripts/error/error-400.phtml:13
 #: airtime_mvc/application/views/scripts/error/error-403.phtml:13
@@ -2872,50 +2852,6 @@ msgstr ""
 msgid "Login name is not unique."
 msgstr ""
 
-#: airtime_mvc/application/forms/BillingClient.php:125
-msgid "What is the name of your favorite childhood friend?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:126
-msgid "What school did you attend for sixth grade?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:127
-msgid "In what city did you meet your spouse/significant other?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:128
-msgid "What street did you live on in third grade?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:129
-msgid "What is the first name of the boy or girl that you first kissed?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:130
-msgid "In what city or town was your first job?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:19
-msgid "Plan type:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:31
-msgid "Billing cycle:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:39
-msgid "Payment method:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:42
-msgid "PayPal"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:43
-msgid "Credit Card via 2Checkout"
-msgstr ""
-
 #: airtime_mvc/application/forms/customvalidators/ConditionalNotEmpty.php:32
 #: airtime_mvc/application/forms/helpers/ValidationTypes.php:8
 msgid "Value is required and can't be empty"
@@ -4320,11 +4256,6 @@ msgstr ""
 msgid "Find"
 msgstr ""
 
-#: airtime_mvc/application/views/scripts/form/edit-user.phtml:7
-#, php-format
-msgid "<b>Note:</b> Since you're the station owner, your account information can be edited in <a href=\"%s\">Billing Settings</a> instead."
-msgstr ""
-
 #: airtime_mvc/application/views/scripts/form/login.phtml:41
 msgid "Forgot your password?"
 msgstr ""
@@ -5069,11 +5000,6 @@ msgstr ""
 msgid "User Type"
 msgstr ""
 
-#: airtime_mvc/application/views/scripts/user/add-user.phtml:31
-#, php-format
-msgid "Super Admin details can be changed in your <a href=\"%s\">Billing Settings</a>."
-msgstr ""
-
 #: airtime_mvc/application/views/scripts/webstream/webstream.phtml:30
 msgid "Stream URL:"
 msgstr ""
diff --git a/airtime_mvc/locale/az/LC_MESSAGES/airtime.po b/airtime_mvc/locale/az/LC_MESSAGES/airtime.po
index d73d4b08e..47b78ad85 100644
--- a/airtime_mvc/locale/az/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/az/LC_MESSAGES/airtime.po
@@ -701,26 +701,6 @@ msgstr ""
 msgid "Listener Stats"
 msgstr ""
 
-#: airtime_mvc/application/configs/navigation.php:144
-msgid "Upgrade"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:144
-msgid "Billing"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:151
-msgid "Account Plans"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:158
-msgid "Account Details"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:165
-msgid "View Invoices"
-msgstr ""
-
 #: airtime_mvc/application/configs/navigation.php:175
 #: airtime_mvc/application/views/scripts/error/error-400.phtml:13
 #: airtime_mvc/application/views/scripts/error/error-403.phtml:13
@@ -2872,50 +2852,6 @@ msgstr ""
 msgid "Login name is not unique."
 msgstr ""
 
-#: airtime_mvc/application/forms/BillingClient.php:125
-msgid "What is the name of your favorite childhood friend?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:126
-msgid "What school did you attend for sixth grade?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:127
-msgid "In what city did you meet your spouse/significant other?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:128
-msgid "What street did you live on in third grade?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:129
-msgid "What is the first name of the boy or girl that you first kissed?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:130
-msgid "In what city or town was your first job?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:19
-msgid "Plan type:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:31
-msgid "Billing cycle:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:39
-msgid "Payment method:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:42
-msgid "PayPal"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:43
-msgid "Credit Card via 2Checkout"
-msgstr ""
-
 #: airtime_mvc/application/forms/customvalidators/ConditionalNotEmpty.php:32
 #: airtime_mvc/application/forms/helpers/ValidationTypes.php:8
 msgid "Value is required and can't be empty"
@@ -4320,11 +4256,6 @@ msgstr ""
 msgid "Find"
 msgstr ""
 
-#: airtime_mvc/application/views/scripts/form/edit-user.phtml:7
-#, php-format
-msgid "<b>Note:</b> Since you're the station owner, your account information can be edited in <a href=\"%s\">Billing Settings</a> instead."
-msgstr ""
-
 #: airtime_mvc/application/views/scripts/form/login.phtml:41
 msgid "Forgot your password?"
 msgstr ""
@@ -5069,11 +5000,6 @@ msgstr ""
 msgid "User Type"
 msgstr ""
 
-#: airtime_mvc/application/views/scripts/user/add-user.phtml:31
-#, php-format
-msgid "Super Admin details can be changed in your <a href=\"%s\">Billing Settings</a>."
-msgstr ""
-
 #: airtime_mvc/application/views/scripts/webstream/webstream.phtml:30
 msgid "Stream URL:"
 msgstr ""
diff --git a/airtime_mvc/locale/az/LC_MESSAGES/pro.po b/airtime_mvc/locale/az/LC_MESSAGES/pro.po
deleted file mode 100644
index 2cb427894..000000000
--- a/airtime_mvc/locale/az/LC_MESSAGES/pro.po
+++ /dev/null
@@ -1,143 +0,0 @@
-#: airtime_mvc/application/controllers/LoginController.php:188
-#, php-format
-msgid "That username or email address could not be found. If you are the station owner, you should <a href=\"%s\">reset your here</a>."
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:16
-msgid "First Name:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:25
-msgid "Last Name:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:34
-msgid "Company Name:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:43
-msgid "Email Address:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:53
-msgid "Address 1:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:62
-msgid "Address 2:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:69
-msgid "City:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:79
-msgid "State/Region:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:88
-msgid "Zip Code / Postal Code:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:101
-msgid "Country:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:111
-msgid "Phone Number:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:120
-msgid "Please choose a security question:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:134
-msgid "Please enter an answer:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:151
-msgid "VAT/Tax ID (EU only)"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:161
-msgid "Subscribe to Sourcefabric newsletter"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:171
-msgid "Password:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:180
-msgid "Verify Password:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:196
-msgid "Save"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/invoices.phtml:7
-msgid "<b>Thank you!</b> Your plan has been updated and you will be invoiced during your next billing cycle."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/invoices.phtml:11
-msgid "Tip: To pay an invoice, click \"View Invoice\" and look for the \"Checkout\" button."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:177
-msgid "Account Plans"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:178
-msgid "Upgrade today to get more listeners and storage space!"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:182
-msgid "Monthly Plans"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:316
-msgid "View Plans"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:318
-msgid "Your Current Plan:"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:332
-msgid "Choose a plan: "
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:358
-msgid "Please enter your payment details:"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/form/password-restore.phtml:5
-#, php-format
-msgid "If you are the primary owner of this station, <a href=\"%s\">please reset your password here</a>."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
-#, php-format
-msgid "Purchase an %s plan!"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
-msgid "My Account"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/plupload/index.phtml:9
-#, php-format
-msgid "Disk quota exceeded. You cannot upload files until you %s upgrade your storage"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/thank-you/index.phtml:16
-msgid "Thank you!"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/thank-you/index.phtml:17
-msgid "Your station has been upgraded successfully."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/thank-you/index.phtml:18
-msgid "Return to Airtime"
-msgstr ""
diff --git a/airtime_mvc/locale/cs_CZ/LC_MESSAGES/airtime.po b/airtime_mvc/locale/cs_CZ/LC_MESSAGES/airtime.po
index c84beede8..a2f23a63c 100644
--- a/airtime_mvc/locale/cs_CZ/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/cs_CZ/LC_MESSAGES/airtime.po
@@ -703,26 +703,6 @@ msgstr "Historie nastavení"
 msgid "Listener Stats"
 msgstr "Statistiky poslechovost"
 
-#: airtime_mvc/application/configs/navigation.php:144
-msgid "Upgrade"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:144
-msgid "Billing"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:151
-msgid "Account Plans"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:158
-msgid "Account Details"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:165
-msgid "View Invoices"
-msgstr ""
-
 #: airtime_mvc/application/configs/navigation.php:175
 #: airtime_mvc/application/views/scripts/error/error-400.phtml:13
 #: airtime_mvc/application/views/scripts/error/error-403.phtml:13
@@ -2876,50 +2856,6 @@ msgstr "Typ uživatele:"
 msgid "Login name is not unique."
 msgstr "Přihlašovací jméno není jedinečné."
 
-#: airtime_mvc/application/forms/BillingClient.php:125
-msgid "What is the name of your favorite childhood friend?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:126
-msgid "What school did you attend for sixth grade?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:127
-msgid "In what city did you meet your spouse/significant other?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:128
-msgid "What street did you live on in third grade?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:129
-msgid "What is the first name of the boy or girl that you first kissed?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:130
-msgid "In what city or town was your first job?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:19
-msgid "Plan type:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:31
-msgid "Billing cycle:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:39
-msgid "Payment method:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:42
-msgid "PayPal"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:43
-msgid "Credit Card via 2Checkout"
-msgstr ""
-
 #: airtime_mvc/application/forms/customvalidators/ConditionalNotEmpty.php:32
 #: airtime_mvc/application/forms/helpers/ValidationTypes.php:8
 msgid "Value is required and can't be empty"
@@ -4326,11 +4262,6 @@ msgstr "Vybrat instanci show"
 msgid "Find"
 msgstr "Najdi"
 
-#: airtime_mvc/application/views/scripts/form/edit-user.phtml:7
-#, php-format
-msgid "<b>Note:</b> Since you're the station owner, your account information can be edited in <a href=\"%s\">Billing Settings</a> instead."
-msgstr ""
-
 #: airtime_mvc/application/views/scripts/form/login.phtml:41
 msgid "Forgot your password?"
 msgstr ""
@@ -5075,11 +5006,6 @@ msgstr "Příjmení"
 msgid "User Type"
 msgstr "Typ uživatele"
 
-#: airtime_mvc/application/views/scripts/user/add-user.phtml:31
-#, php-format
-msgid "Super Admin details can be changed in your <a href=\"%s\">Billing Settings</a>."
-msgstr ""
-
 #: airtime_mvc/application/views/scripts/webstream/webstream.phtml:30
 msgid "Stream URL:"
 msgstr "URL streamu:"
diff --git a/airtime_mvc/locale/cs_CZ/LC_MESSAGES/pro.po b/airtime_mvc/locale/cs_CZ/LC_MESSAGES/pro.po
deleted file mode 100644
index 2cb427894..000000000
--- a/airtime_mvc/locale/cs_CZ/LC_MESSAGES/pro.po
+++ /dev/null
@@ -1,143 +0,0 @@
-#: airtime_mvc/application/controllers/LoginController.php:188
-#, php-format
-msgid "That username or email address could not be found. If you are the station owner, you should <a href=\"%s\">reset your here</a>."
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:16
-msgid "First Name:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:25
-msgid "Last Name:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:34
-msgid "Company Name:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:43
-msgid "Email Address:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:53
-msgid "Address 1:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:62
-msgid "Address 2:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:69
-msgid "City:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:79
-msgid "State/Region:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:88
-msgid "Zip Code / Postal Code:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:101
-msgid "Country:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:111
-msgid "Phone Number:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:120
-msgid "Please choose a security question:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:134
-msgid "Please enter an answer:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:151
-msgid "VAT/Tax ID (EU only)"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:161
-msgid "Subscribe to Sourcefabric newsletter"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:171
-msgid "Password:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:180
-msgid "Verify Password:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:196
-msgid "Save"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/invoices.phtml:7
-msgid "<b>Thank you!</b> Your plan has been updated and you will be invoiced during your next billing cycle."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/invoices.phtml:11
-msgid "Tip: To pay an invoice, click \"View Invoice\" and look for the \"Checkout\" button."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:177
-msgid "Account Plans"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:178
-msgid "Upgrade today to get more listeners and storage space!"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:182
-msgid "Monthly Plans"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:316
-msgid "View Plans"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:318
-msgid "Your Current Plan:"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:332
-msgid "Choose a plan: "
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:358
-msgid "Please enter your payment details:"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/form/password-restore.phtml:5
-#, php-format
-msgid "If you are the primary owner of this station, <a href=\"%s\">please reset your password here</a>."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
-#, php-format
-msgid "Purchase an %s plan!"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
-msgid "My Account"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/plupload/index.phtml:9
-#, php-format
-msgid "Disk quota exceeded. You cannot upload files until you %s upgrade your storage"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/thank-you/index.phtml:16
-msgid "Thank you!"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/thank-you/index.phtml:17
-msgid "Your station has been upgraded successfully."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/thank-you/index.phtml:18
-msgid "Return to Airtime"
-msgstr ""
diff --git a/airtime_mvc/locale/da_DK/LC_MESSAGES/airtime.po b/airtime_mvc/locale/da_DK/LC_MESSAGES/airtime.po
index 9621d11db..0ef527737 100644
--- a/airtime_mvc/locale/da_DK/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/da_DK/LC_MESSAGES/airtime.po
@@ -701,26 +701,6 @@ msgstr ""
 msgid "Listener Stats"
 msgstr ""
 
-#: airtime_mvc/application/configs/navigation.php:144
-msgid "Upgrade"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:144
-msgid "Billing"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:151
-msgid "Account Plans"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:158
-msgid "Account Details"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:165
-msgid "View Invoices"
-msgstr ""
-
 #: airtime_mvc/application/configs/navigation.php:175
 #: airtime_mvc/application/views/scripts/error/error-400.phtml:13
 #: airtime_mvc/application/views/scripts/error/error-403.phtml:13
@@ -2872,50 +2852,6 @@ msgstr ""
 msgid "Login name is not unique."
 msgstr ""
 
-#: airtime_mvc/application/forms/BillingClient.php:125
-msgid "What is the name of your favorite childhood friend?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:126
-msgid "What school did you attend for sixth grade?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:127
-msgid "In what city did you meet your spouse/significant other?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:128
-msgid "What street did you live on in third grade?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:129
-msgid "What is the first name of the boy or girl that you first kissed?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:130
-msgid "In what city or town was your first job?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:19
-msgid "Plan type:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:31
-msgid "Billing cycle:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:39
-msgid "Payment method:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:42
-msgid "PayPal"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:43
-msgid "Credit Card via 2Checkout"
-msgstr ""
-
 #: airtime_mvc/application/forms/customvalidators/ConditionalNotEmpty.php:32
 #: airtime_mvc/application/forms/helpers/ValidationTypes.php:8
 msgid "Value is required and can't be empty"
@@ -4320,11 +4256,6 @@ msgstr ""
 msgid "Find"
 msgstr ""
 
-#: airtime_mvc/application/views/scripts/form/edit-user.phtml:7
-#, php-format
-msgid "<b>Note:</b> Since you're the station owner, your account information can be edited in <a href=\"%s\">Billing Settings</a> instead."
-msgstr ""
-
 #: airtime_mvc/application/views/scripts/form/login.phtml:41
 msgid "Forgot your password?"
 msgstr ""
@@ -5069,11 +5000,6 @@ msgstr ""
 msgid "User Type"
 msgstr ""
 
-#: airtime_mvc/application/views/scripts/user/add-user.phtml:31
-#, php-format
-msgid "Super Admin details can be changed in your <a href=\"%s\">Billing Settings</a>."
-msgstr ""
-
 #: airtime_mvc/application/views/scripts/webstream/webstream.phtml:30
 msgid "Stream URL:"
 msgstr ""
diff --git a/airtime_mvc/locale/de_AT/LC_MESSAGES/airtime.po b/airtime_mvc/locale/de_AT/LC_MESSAGES/airtime.po
index 1b21afcba..cde952b5a 100644
--- a/airtime_mvc/locale/de_AT/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/de_AT/LC_MESSAGES/airtime.po
@@ -703,26 +703,6 @@ msgstr "Verlaufsvorlagen"
 msgid "Listener Stats"
 msgstr "Hörerstatistiken"
 
-#: airtime_mvc/application/configs/navigation.php:144
-msgid "Upgrade"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:144
-msgid "Billing"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:151
-msgid "Account Plans"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:158
-msgid "Account Details"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:165
-msgid "View Invoices"
-msgstr ""
-
 #: airtime_mvc/application/configs/navigation.php:175
 #: airtime_mvc/application/views/scripts/error/error-400.phtml:13
 #: airtime_mvc/application/views/scripts/error/error-403.phtml:13
@@ -2889,50 +2869,6 @@ msgstr "Benutzertyp:"
 msgid "Login name is not unique."
 msgstr "Benutzername ist nicht einmalig."
 
-#: airtime_mvc/application/forms/BillingClient.php:125
-msgid "What is the name of your favorite childhood friend?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:126
-msgid "What school did you attend for sixth grade?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:127
-msgid "In what city did you meet your spouse/significant other?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:128
-msgid "What street did you live on in third grade?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:129
-msgid "What is the first name of the boy or girl that you first kissed?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:130
-msgid "In what city or town was your first job?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:19
-msgid "Plan type:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:31
-msgid "Billing cycle:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:39
-msgid "Payment method:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:42
-msgid "PayPal"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:43
-msgid "Credit Card via 2Checkout"
-msgstr ""
-
 #: airtime_mvc/application/forms/customvalidators/ConditionalNotEmpty.php:32
 #: airtime_mvc/application/forms/helpers/ValidationTypes.php:8
 msgid "Value is required and can't be empty"
@@ -4339,11 +4275,6 @@ msgstr "Folge wählen"
 msgid "Find"
 msgstr "Finden"
 
-#: airtime_mvc/application/views/scripts/form/edit-user.phtml:7
-#, php-format
-msgid "<b>Note:</b> Since you're the station owner, your account information can be edited in <a href=\"%s\">Billing Settings</a> instead."
-msgstr ""
-
 #: airtime_mvc/application/views/scripts/form/login.phtml:41
 msgid "Forgot your password?"
 msgstr ""
@@ -5088,11 +5019,6 @@ msgstr "Nachname"
 msgid "User Type"
 msgstr "Benutzertyp"
 
-#: airtime_mvc/application/views/scripts/user/add-user.phtml:31
-#, php-format
-msgid "Super Admin details can be changed in your <a href=\"%s\">Billing Settings</a>."
-msgstr ""
-
 #: airtime_mvc/application/views/scripts/webstream/webstream.phtml:30
 msgid "Stream URL:"
 msgstr "Stream URL:"
diff --git a/airtime_mvc/locale/de_AT/LC_MESSAGES/pro.po b/airtime_mvc/locale/de_AT/LC_MESSAGES/pro.po
deleted file mode 100644
index 2cb427894..000000000
--- a/airtime_mvc/locale/de_AT/LC_MESSAGES/pro.po
+++ /dev/null
@@ -1,143 +0,0 @@
-#: airtime_mvc/application/controllers/LoginController.php:188
-#, php-format
-msgid "That username or email address could not be found. If you are the station owner, you should <a href=\"%s\">reset your here</a>."
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:16
-msgid "First Name:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:25
-msgid "Last Name:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:34
-msgid "Company Name:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:43
-msgid "Email Address:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:53
-msgid "Address 1:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:62
-msgid "Address 2:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:69
-msgid "City:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:79
-msgid "State/Region:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:88
-msgid "Zip Code / Postal Code:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:101
-msgid "Country:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:111
-msgid "Phone Number:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:120
-msgid "Please choose a security question:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:134
-msgid "Please enter an answer:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:151
-msgid "VAT/Tax ID (EU only)"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:161
-msgid "Subscribe to Sourcefabric newsletter"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:171
-msgid "Password:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:180
-msgid "Verify Password:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:196
-msgid "Save"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/invoices.phtml:7
-msgid "<b>Thank you!</b> Your plan has been updated and you will be invoiced during your next billing cycle."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/invoices.phtml:11
-msgid "Tip: To pay an invoice, click \"View Invoice\" and look for the \"Checkout\" button."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:177
-msgid "Account Plans"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:178
-msgid "Upgrade today to get more listeners and storage space!"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:182
-msgid "Monthly Plans"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:316
-msgid "View Plans"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:318
-msgid "Your Current Plan:"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:332
-msgid "Choose a plan: "
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:358
-msgid "Please enter your payment details:"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/form/password-restore.phtml:5
-#, php-format
-msgid "If you are the primary owner of this station, <a href=\"%s\">please reset your password here</a>."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
-#, php-format
-msgid "Purchase an %s plan!"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
-msgid "My Account"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/plupload/index.phtml:9
-#, php-format
-msgid "Disk quota exceeded. You cannot upload files until you %s upgrade your storage"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/thank-you/index.phtml:16
-msgid "Thank you!"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/thank-you/index.phtml:17
-msgid "Your station has been upgraded successfully."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/thank-you/index.phtml:18
-msgid "Return to Airtime"
-msgstr ""
diff --git a/airtime_mvc/locale/de_DE/LC_MESSAGES/airtime.po b/airtime_mvc/locale/de_DE/LC_MESSAGES/airtime.po
index ac5381629..da39ca8ca 100644
--- a/airtime_mvc/locale/de_DE/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/de_DE/LC_MESSAGES/airtime.po
@@ -707,26 +707,6 @@ msgstr "Verlaufsvorlagen"
 msgid "Listener Stats"
 msgstr "Hörerstatistiken"
 
-#: airtime_mvc/application/configs/navigation.php:144
-msgid "Upgrade"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:144
-msgid "Billing"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:151
-msgid "Account Plans"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:158
-msgid "Account Details"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:165
-msgid "View Invoices"
-msgstr ""
-
 #: airtime_mvc/application/configs/navigation.php:175
 #: airtime_mvc/application/views/scripts/error/error-400.phtml:13
 #: airtime_mvc/application/views/scripts/error/error-403.phtml:13
@@ -2891,50 +2871,6 @@ msgstr "Benutzertyp:"
 msgid "Login name is not unique."
 msgstr "Benutzername ist bereits vorhanden."
 
-#: airtime_mvc/application/forms/BillingClient.php:125
-msgid "What is the name of your favorite childhood friend?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:126
-msgid "What school did you attend for sixth grade?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:127
-msgid "In what city did you meet your spouse/significant other?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:128
-msgid "What street did you live on in third grade?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:129
-msgid "What is the first name of the boy or girl that you first kissed?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:130
-msgid "In what city or town was your first job?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:19
-msgid "Plan type:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:31
-msgid "Billing cycle:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:39
-msgid "Payment method:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:42
-msgid "PayPal"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:43
-msgid "Credit Card via 2Checkout"
-msgstr ""
-
 #: airtime_mvc/application/forms/customvalidators/ConditionalNotEmpty.php:32
 #: airtime_mvc/application/forms/helpers/ValidationTypes.php:8
 msgid "Value is required and can't be empty"
@@ -4341,11 +4277,6 @@ msgstr "Folge wählen"
 msgid "Find"
 msgstr "Finden"
 
-#: airtime_mvc/application/views/scripts/form/edit-user.phtml:7
-#, php-format
-msgid "<b>Note:</b> Since you're the station owner, your account information can be edited in <a href=\"%s\">Billing Settings</a> instead."
-msgstr ""
-
 #: airtime_mvc/application/views/scripts/form/login.phtml:41
 msgid "Forgot your password?"
 msgstr "Passwort vergessen?"
@@ -5090,11 +5021,6 @@ msgstr "Nachname"
 msgid "User Type"
 msgstr "Benutzertyp"
 
-#: airtime_mvc/application/views/scripts/user/add-user.phtml:31
-#, php-format
-msgid "Super Admin details can be changed in your <a href=\"%s\">Billing Settings</a>."
-msgstr ""
-
 #: airtime_mvc/application/views/scripts/webstream/webstream.phtml:30
 msgid "Stream URL:"
 msgstr "Stream URL:"
diff --git a/airtime_mvc/locale/de_DE/LC_MESSAGES/pro.po b/airtime_mvc/locale/de_DE/LC_MESSAGES/pro.po
deleted file mode 100644
index 2cb427894..000000000
--- a/airtime_mvc/locale/de_DE/LC_MESSAGES/pro.po
+++ /dev/null
@@ -1,143 +0,0 @@
-#: airtime_mvc/application/controllers/LoginController.php:188
-#, php-format
-msgid "That username or email address could not be found. If you are the station owner, you should <a href=\"%s\">reset your here</a>."
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:16
-msgid "First Name:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:25
-msgid "Last Name:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:34
-msgid "Company Name:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:43
-msgid "Email Address:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:53
-msgid "Address 1:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:62
-msgid "Address 2:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:69
-msgid "City:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:79
-msgid "State/Region:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:88
-msgid "Zip Code / Postal Code:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:101
-msgid "Country:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:111
-msgid "Phone Number:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:120
-msgid "Please choose a security question:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:134
-msgid "Please enter an answer:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:151
-msgid "VAT/Tax ID (EU only)"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:161
-msgid "Subscribe to Sourcefabric newsletter"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:171
-msgid "Password:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:180
-msgid "Verify Password:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:196
-msgid "Save"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/invoices.phtml:7
-msgid "<b>Thank you!</b> Your plan has been updated and you will be invoiced during your next billing cycle."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/invoices.phtml:11
-msgid "Tip: To pay an invoice, click \"View Invoice\" and look for the \"Checkout\" button."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:177
-msgid "Account Plans"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:178
-msgid "Upgrade today to get more listeners and storage space!"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:182
-msgid "Monthly Plans"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:316
-msgid "View Plans"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:318
-msgid "Your Current Plan:"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:332
-msgid "Choose a plan: "
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:358
-msgid "Please enter your payment details:"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/form/password-restore.phtml:5
-#, php-format
-msgid "If you are the primary owner of this station, <a href=\"%s\">please reset your password here</a>."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
-#, php-format
-msgid "Purchase an %s plan!"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
-msgid "My Account"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/plupload/index.phtml:9
-#, php-format
-msgid "Disk quota exceeded. You cannot upload files until you %s upgrade your storage"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/thank-you/index.phtml:16
-msgid "Thank you!"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/thank-you/index.phtml:17
-msgid "Your station has been upgraded successfully."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/thank-you/index.phtml:18
-msgid "Return to Airtime"
-msgstr ""
diff --git a/airtime_mvc/locale/el_GR/LC_MESSAGES/airtime.po b/airtime_mvc/locale/el_GR/LC_MESSAGES/airtime.po
index 5975c2f42..a2b597348 100644
--- a/airtime_mvc/locale/el_GR/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/el_GR/LC_MESSAGES/airtime.po
@@ -703,26 +703,6 @@ msgstr "Ιστορικό Template"
 msgid "Listener Stats"
 msgstr "Στατιστικές Ακροατών"
 
-#: airtime_mvc/application/configs/navigation.php:144
-msgid "Upgrade"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:144
-msgid "Billing"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:151
-msgid "Account Plans"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:158
-msgid "Account Details"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:165
-msgid "View Invoices"
-msgstr ""
-
 #: airtime_mvc/application/configs/navigation.php:175
 #: airtime_mvc/application/views/scripts/error/error-400.phtml:13
 #: airtime_mvc/application/views/scripts/error/error-403.phtml:13
@@ -2876,50 +2856,6 @@ msgstr "Τύπος Χρήστη:"
 msgid "Login name is not unique."
 msgstr "Το όνομα εισόδου δεν είναι μοναδικό."
 
-#: airtime_mvc/application/forms/BillingClient.php:125
-msgid "What is the name of your favorite childhood friend?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:126
-msgid "What school did you attend for sixth grade?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:127
-msgid "In what city did you meet your spouse/significant other?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:128
-msgid "What street did you live on in third grade?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:129
-msgid "What is the first name of the boy or girl that you first kissed?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:130
-msgid "In what city or town was your first job?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:19
-msgid "Plan type:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:31
-msgid "Billing cycle:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:39
-msgid "Payment method:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:42
-msgid "PayPal"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:43
-msgid "Credit Card via 2Checkout"
-msgstr ""
-
 #: airtime_mvc/application/forms/customvalidators/ConditionalNotEmpty.php:32
 #: airtime_mvc/application/forms/helpers/ValidationTypes.php:8
 msgid "Value is required and can't be empty"
@@ -4326,11 +4262,6 @@ msgstr "Επιλογή Παρουσίας Εκπομπής"
 msgid "Find"
 msgstr "Εύρεση"
 
-#: airtime_mvc/application/views/scripts/form/edit-user.phtml:7
-#, php-format
-msgid "<b>Note:</b> Since you're the station owner, your account information can be edited in <a href=\"%s\">Billing Settings</a> instead."
-msgstr ""
-
 #: airtime_mvc/application/views/scripts/form/login.phtml:41
 msgid "Forgot your password?"
 msgstr ""
@@ -5075,11 +5006,6 @@ msgstr "Επώνυμο"
 msgid "User Type"
 msgstr "Τύπος Χρήστη"
 
-#: airtime_mvc/application/views/scripts/user/add-user.phtml:31
-#, php-format
-msgid "Super Admin details can be changed in your <a href=\"%s\">Billing Settings</a>."
-msgstr ""
-
 #: airtime_mvc/application/views/scripts/webstream/webstream.phtml:30
 msgid "Stream URL:"
 msgstr "URL Stream:"
diff --git a/airtime_mvc/locale/el_GR/LC_MESSAGES/pro.po b/airtime_mvc/locale/el_GR/LC_MESSAGES/pro.po
deleted file mode 100644
index 2cb427894..000000000
--- a/airtime_mvc/locale/el_GR/LC_MESSAGES/pro.po
+++ /dev/null
@@ -1,143 +0,0 @@
-#: airtime_mvc/application/controllers/LoginController.php:188
-#, php-format
-msgid "That username or email address could not be found. If you are the station owner, you should <a href=\"%s\">reset your here</a>."
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:16
-msgid "First Name:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:25
-msgid "Last Name:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:34
-msgid "Company Name:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:43
-msgid "Email Address:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:53
-msgid "Address 1:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:62
-msgid "Address 2:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:69
-msgid "City:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:79
-msgid "State/Region:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:88
-msgid "Zip Code / Postal Code:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:101
-msgid "Country:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:111
-msgid "Phone Number:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:120
-msgid "Please choose a security question:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:134
-msgid "Please enter an answer:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:151
-msgid "VAT/Tax ID (EU only)"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:161
-msgid "Subscribe to Sourcefabric newsletter"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:171
-msgid "Password:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:180
-msgid "Verify Password:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:196
-msgid "Save"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/invoices.phtml:7
-msgid "<b>Thank you!</b> Your plan has been updated and you will be invoiced during your next billing cycle."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/invoices.phtml:11
-msgid "Tip: To pay an invoice, click \"View Invoice\" and look for the \"Checkout\" button."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:177
-msgid "Account Plans"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:178
-msgid "Upgrade today to get more listeners and storage space!"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:182
-msgid "Monthly Plans"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:316
-msgid "View Plans"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:318
-msgid "Your Current Plan:"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:332
-msgid "Choose a plan: "
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:358
-msgid "Please enter your payment details:"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/form/password-restore.phtml:5
-#, php-format
-msgid "If you are the primary owner of this station, <a href=\"%s\">please reset your password here</a>."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
-#, php-format
-msgid "Purchase an %s plan!"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
-msgid "My Account"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/plupload/index.phtml:9
-#, php-format
-msgid "Disk quota exceeded. You cannot upload files until you %s upgrade your storage"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/thank-you/index.phtml:16
-msgid "Thank you!"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/thank-you/index.phtml:17
-msgid "Your station has been upgraded successfully."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/thank-you/index.phtml:18
-msgid "Return to Airtime"
-msgstr ""
diff --git a/airtime_mvc/locale/en_CA/LC_MESSAGES/airtime.po b/airtime_mvc/locale/en_CA/LC_MESSAGES/airtime.po
index 78ef6a9b9..3b0791adb 100644
--- a/airtime_mvc/locale/en_CA/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/en_CA/LC_MESSAGES/airtime.po
@@ -703,26 +703,6 @@ msgstr "History Templates"
 msgid "Listener Stats"
 msgstr "Listener Stats"
 
-#: airtime_mvc/application/configs/navigation.php:144
-msgid "Upgrade"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:144
-msgid "Billing"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:151
-msgid "Account Plans"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:158
-msgid "Account Details"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:165
-msgid "View Invoices"
-msgstr ""
-
 #: airtime_mvc/application/configs/navigation.php:175
 #: airtime_mvc/application/views/scripts/error/error-400.phtml:13
 #: airtime_mvc/application/views/scripts/error/error-403.phtml:13
@@ -2876,50 +2856,6 @@ msgstr "User Type:"
 msgid "Login name is not unique."
 msgstr "Login name is not unique."
 
-#: airtime_mvc/application/forms/BillingClient.php:125
-msgid "What is the name of your favorite childhood friend?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:126
-msgid "What school did you attend for sixth grade?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:127
-msgid "In what city did you meet your spouse/significant other?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:128
-msgid "What street did you live on in third grade?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:129
-msgid "What is the first name of the boy or girl that you first kissed?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:130
-msgid "In what city or town was your first job?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:19
-msgid "Plan type:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:31
-msgid "Billing cycle:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:39
-msgid "Payment method:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:42
-msgid "PayPal"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:43
-msgid "Credit Card via 2Checkout"
-msgstr ""
-
 #: airtime_mvc/application/forms/customvalidators/ConditionalNotEmpty.php:32
 #: airtime_mvc/application/forms/helpers/ValidationTypes.php:8
 msgid "Value is required and can't be empty"
@@ -4326,11 +4262,6 @@ msgstr "Choose Show Instance"
 msgid "Find"
 msgstr "Find"
 
-#: airtime_mvc/application/views/scripts/form/edit-user.phtml:7
-#, php-format
-msgid "<b>Note:</b> Since you're the station owner, your account information can be edited in <a href=\"%s\">Billing Settings</a> instead."
-msgstr ""
-
 #: airtime_mvc/application/views/scripts/form/login.phtml:41
 msgid "Forgot your password?"
 msgstr ""
@@ -5075,11 +5006,6 @@ msgstr "Last Name"
 msgid "User Type"
 msgstr "User Type"
 
-#: airtime_mvc/application/views/scripts/user/add-user.phtml:31
-#, php-format
-msgid "Super Admin details can be changed in your <a href=\"%s\">Billing Settings</a>."
-msgstr ""
-
 #: airtime_mvc/application/views/scripts/webstream/webstream.phtml:30
 msgid "Stream URL:"
 msgstr "Stream URL:"
diff --git a/airtime_mvc/locale/en_CA/LC_MESSAGES/pro.po b/airtime_mvc/locale/en_CA/LC_MESSAGES/pro.po
deleted file mode 100644
index 2cb427894..000000000
--- a/airtime_mvc/locale/en_CA/LC_MESSAGES/pro.po
+++ /dev/null
@@ -1,143 +0,0 @@
-#: airtime_mvc/application/controllers/LoginController.php:188
-#, php-format
-msgid "That username or email address could not be found. If you are the station owner, you should <a href=\"%s\">reset your here</a>."
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:16
-msgid "First Name:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:25
-msgid "Last Name:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:34
-msgid "Company Name:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:43
-msgid "Email Address:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:53
-msgid "Address 1:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:62
-msgid "Address 2:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:69
-msgid "City:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:79
-msgid "State/Region:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:88
-msgid "Zip Code / Postal Code:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:101
-msgid "Country:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:111
-msgid "Phone Number:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:120
-msgid "Please choose a security question:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:134
-msgid "Please enter an answer:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:151
-msgid "VAT/Tax ID (EU only)"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:161
-msgid "Subscribe to Sourcefabric newsletter"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:171
-msgid "Password:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:180
-msgid "Verify Password:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:196
-msgid "Save"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/invoices.phtml:7
-msgid "<b>Thank you!</b> Your plan has been updated and you will be invoiced during your next billing cycle."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/invoices.phtml:11
-msgid "Tip: To pay an invoice, click \"View Invoice\" and look for the \"Checkout\" button."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:177
-msgid "Account Plans"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:178
-msgid "Upgrade today to get more listeners and storage space!"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:182
-msgid "Monthly Plans"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:316
-msgid "View Plans"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:318
-msgid "Your Current Plan:"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:332
-msgid "Choose a plan: "
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:358
-msgid "Please enter your payment details:"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/form/password-restore.phtml:5
-#, php-format
-msgid "If you are the primary owner of this station, <a href=\"%s\">please reset your password here</a>."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
-#, php-format
-msgid "Purchase an %s plan!"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
-msgid "My Account"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/plupload/index.phtml:9
-#, php-format
-msgid "Disk quota exceeded. You cannot upload files until you %s upgrade your storage"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/thank-you/index.phtml:16
-msgid "Thank you!"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/thank-you/index.phtml:17
-msgid "Your station has been upgraded successfully."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/thank-you/index.phtml:18
-msgid "Return to Airtime"
-msgstr ""
diff --git a/airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.po b/airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.po
index b3f5d8bb7..08d0104df 100644
--- a/airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/en_GB/LC_MESSAGES/airtime.po
@@ -704,26 +704,6 @@ msgstr "History Templates"
 msgid "Listener Stats"
 msgstr "Listener Stats"
 
-#: airtime_mvc/application/configs/navigation.php:144
-msgid "Upgrade"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:144
-msgid "Billing"
-msgstr "Billing"
-
-#: airtime_mvc/application/configs/navigation.php:151
-msgid "Account Plans"
-msgstr "Account Plans"
-
-#: airtime_mvc/application/configs/navigation.php:158
-msgid "Account Details"
-msgstr "Account Details"
-
-#: airtime_mvc/application/configs/navigation.php:165
-msgid "View Invoices"
-msgstr "View Invoices"
-
 #: airtime_mvc/application/configs/navigation.php:175
 #: airtime_mvc/application/views/scripts/error/error-400.phtml:13
 #: airtime_mvc/application/views/scripts/error/error-403.phtml:13
@@ -2877,50 +2857,6 @@ msgstr "User Type:"
 msgid "Login name is not unique."
 msgstr "Login name is not unique."
 
-#: airtime_mvc/application/forms/BillingClient.php:125
-msgid "What is the name of your favorite childhood friend?"
-msgstr "What was the name of your favourite childhood friend?"
-
-#: airtime_mvc/application/forms/BillingClient.php:126
-msgid "What school did you attend for sixth grade?"
-msgstr "Which school did you attend when you were twelve years old?"
-
-#: airtime_mvc/application/forms/BillingClient.php:127
-msgid "In what city did you meet your spouse/significant other?"
-msgstr "In which city, town or village did you meet the love of your life?"
-
-#: airtime_mvc/application/forms/BillingClient.php:128
-msgid "What street did you live on in third grade?"
-msgstr "Which road did you live on when you were in primary school?"
-
-#: airtime_mvc/application/forms/BillingClient.php:129
-msgid "What is the first name of the boy or girl that you first kissed?"
-msgstr "What was the first name of the first boy or girl that you kissed?"
-
-#: airtime_mvc/application/forms/BillingClient.php:130
-msgid "In what city or town was your first job?"
-msgstr "In which city or town did you have your first job?"
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:19
-msgid "Plan type:"
-msgstr "Plan type:"
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:31
-msgid "Billing cycle:"
-msgstr "Billing cycle:"
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:39
-msgid "Payment method:"
-msgstr "Payment method:"
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:42
-msgid "PayPal"
-msgstr "PayPal"
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:43
-msgid "Credit Card via 2Checkout"
-msgstr "Credit Card via 2Checkout"
-
 #: airtime_mvc/application/forms/customvalidators/ConditionalNotEmpty.php:32
 #: airtime_mvc/application/forms/helpers/ValidationTypes.php:8
 msgid "Value is required and can't be empty"
@@ -4330,11 +4266,6 @@ msgstr "Choose Show Instance"
 msgid "Find"
 msgstr "Find"
 
-#: airtime_mvc/application/views/scripts/form/edit-user.phtml:7
-#, php-format
-msgid "<b>Note:</b> Since you're the station owner, your account information can be edited in <a href=\"%s\">Billing Settings</a> instead."
-msgstr "<b>Note:</b> Since you're the station owner, your account information can be edited in <a href=\"%s\">Billing Settings</a> instead."
-
 #: airtime_mvc/application/views/scripts/form/login.phtml:41
 msgid "Forgot your password?"
 msgstr "Forgot your password?"
@@ -5079,11 +5010,6 @@ msgstr "Last Name"
 msgid "User Type"
 msgstr "User Type"
 
-#: airtime_mvc/application/views/scripts/user/add-user.phtml:31
-#, php-format
-msgid "Super Admin details can be changed in your <a href=\"%s\">Billing Settings</a>."
-msgstr "Super Admin details can be changed in your <a href=\"%s\">Billing Settings</a>."
-
 #: airtime_mvc/application/views/scripts/webstream/webstream.phtml:30
 msgid "Stream URL:"
 msgstr "Stream URL:"
diff --git a/airtime_mvc/locale/en_GB/LC_MESSAGES/pro.po b/airtime_mvc/locale/en_GB/LC_MESSAGES/pro.po
deleted file mode 100644
index 2cb427894..000000000
--- a/airtime_mvc/locale/en_GB/LC_MESSAGES/pro.po
+++ /dev/null
@@ -1,143 +0,0 @@
-#: airtime_mvc/application/controllers/LoginController.php:188
-#, php-format
-msgid "That username or email address could not be found. If you are the station owner, you should <a href=\"%s\">reset your here</a>."
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:16
-msgid "First Name:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:25
-msgid "Last Name:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:34
-msgid "Company Name:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:43
-msgid "Email Address:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:53
-msgid "Address 1:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:62
-msgid "Address 2:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:69
-msgid "City:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:79
-msgid "State/Region:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:88
-msgid "Zip Code / Postal Code:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:101
-msgid "Country:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:111
-msgid "Phone Number:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:120
-msgid "Please choose a security question:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:134
-msgid "Please enter an answer:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:151
-msgid "VAT/Tax ID (EU only)"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:161
-msgid "Subscribe to Sourcefabric newsletter"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:171
-msgid "Password:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:180
-msgid "Verify Password:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:196
-msgid "Save"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/invoices.phtml:7
-msgid "<b>Thank you!</b> Your plan has been updated and you will be invoiced during your next billing cycle."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/invoices.phtml:11
-msgid "Tip: To pay an invoice, click \"View Invoice\" and look for the \"Checkout\" button."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:177
-msgid "Account Plans"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:178
-msgid "Upgrade today to get more listeners and storage space!"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:182
-msgid "Monthly Plans"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:316
-msgid "View Plans"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:318
-msgid "Your Current Plan:"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:332
-msgid "Choose a plan: "
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:358
-msgid "Please enter your payment details:"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/form/password-restore.phtml:5
-#, php-format
-msgid "If you are the primary owner of this station, <a href=\"%s\">please reset your password here</a>."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
-#, php-format
-msgid "Purchase an %s plan!"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
-msgid "My Account"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/plupload/index.phtml:9
-#, php-format
-msgid "Disk quota exceeded. You cannot upload files until you %s upgrade your storage"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/thank-you/index.phtml:16
-msgid "Thank you!"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/thank-you/index.phtml:17
-msgid "Your station has been upgraded successfully."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/thank-you/index.phtml:18
-msgid "Return to Airtime"
-msgstr ""
diff --git a/airtime_mvc/locale/en_US/LC_MESSAGES/airtime.po b/airtime_mvc/locale/en_US/LC_MESSAGES/airtime.po
index ac0f3ad72..18d1813d3 100644
--- a/airtime_mvc/locale/en_US/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/en_US/LC_MESSAGES/airtime.po
@@ -703,26 +703,6 @@ msgstr "History Templates"
 msgid "Listener Stats"
 msgstr "Listener Stats"
 
-#: airtime_mvc/application/configs/navigation.php:144
-msgid "Upgrade"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:144
-msgid "Billing"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:151
-msgid "Account Plans"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:158
-msgid "Account Details"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:165
-msgid "View Invoices"
-msgstr ""
-
 #: airtime_mvc/application/configs/navigation.php:175
 #: airtime_mvc/application/views/scripts/error/error-400.phtml:13
 #: airtime_mvc/application/views/scripts/error/error-403.phtml:13
@@ -2876,50 +2856,6 @@ msgstr "User Type:"
 msgid "Login name is not unique."
 msgstr "Login name is not unique."
 
-#: airtime_mvc/application/forms/BillingClient.php:125
-msgid "What is the name of your favorite childhood friend?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:126
-msgid "What school did you attend for sixth grade?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:127
-msgid "In what city did you meet your spouse/significant other?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:128
-msgid "What street did you live on in third grade?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:129
-msgid "What is the first name of the boy or girl that you first kissed?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:130
-msgid "In what city or town was your first job?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:19
-msgid "Plan type:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:31
-msgid "Billing cycle:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:39
-msgid "Payment method:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:42
-msgid "PayPal"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:43
-msgid "Credit Card via 2Checkout"
-msgstr ""
-
 #: airtime_mvc/application/forms/customvalidators/ConditionalNotEmpty.php:32
 #: airtime_mvc/application/forms/helpers/ValidationTypes.php:8
 msgid "Value is required and can't be empty"
@@ -4326,11 +4262,6 @@ msgstr "Choose Show Instance"
 msgid "Find"
 msgstr "Find"
 
-#: airtime_mvc/application/views/scripts/form/edit-user.phtml:7
-#, php-format
-msgid "<b>Note:</b> Since you're the station owner, your account information can be edited in <a href=\"%s\">Billing Settings</a> instead."
-msgstr ""
-
 #: airtime_mvc/application/views/scripts/form/login.phtml:41
 msgid "Forgot your password?"
 msgstr ""
@@ -5075,11 +5006,6 @@ msgstr "Last Name"
 msgid "User Type"
 msgstr "User Type"
 
-#: airtime_mvc/application/views/scripts/user/add-user.phtml:31
-#, php-format
-msgid "Super Admin details can be changed in your <a href=\"%s\">Billing Settings</a>."
-msgstr ""
-
 #: airtime_mvc/application/views/scripts/webstream/webstream.phtml:30
 msgid "Stream URL:"
 msgstr "Stream URL:"
diff --git a/airtime_mvc/locale/en_US/LC_MESSAGES/pro.po b/airtime_mvc/locale/en_US/LC_MESSAGES/pro.po
deleted file mode 100644
index 2cb427894..000000000
--- a/airtime_mvc/locale/en_US/LC_MESSAGES/pro.po
+++ /dev/null
@@ -1,143 +0,0 @@
-#: airtime_mvc/application/controllers/LoginController.php:188
-#, php-format
-msgid "That username or email address could not be found. If you are the station owner, you should <a href=\"%s\">reset your here</a>."
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:16
-msgid "First Name:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:25
-msgid "Last Name:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:34
-msgid "Company Name:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:43
-msgid "Email Address:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:53
-msgid "Address 1:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:62
-msgid "Address 2:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:69
-msgid "City:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:79
-msgid "State/Region:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:88
-msgid "Zip Code / Postal Code:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:101
-msgid "Country:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:111
-msgid "Phone Number:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:120
-msgid "Please choose a security question:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:134
-msgid "Please enter an answer:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:151
-msgid "VAT/Tax ID (EU only)"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:161
-msgid "Subscribe to Sourcefabric newsletter"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:171
-msgid "Password:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:180
-msgid "Verify Password:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:196
-msgid "Save"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/invoices.phtml:7
-msgid "<b>Thank you!</b> Your plan has been updated and you will be invoiced during your next billing cycle."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/invoices.phtml:11
-msgid "Tip: To pay an invoice, click \"View Invoice\" and look for the \"Checkout\" button."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:177
-msgid "Account Plans"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:178
-msgid "Upgrade today to get more listeners and storage space!"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:182
-msgid "Monthly Plans"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:316
-msgid "View Plans"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:318
-msgid "Your Current Plan:"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:332
-msgid "Choose a plan: "
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:358
-msgid "Please enter your payment details:"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/form/password-restore.phtml:5
-#, php-format
-msgid "If you are the primary owner of this station, <a href=\"%s\">please reset your password here</a>."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
-#, php-format
-msgid "Purchase an %s plan!"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
-msgid "My Account"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/plupload/index.phtml:9
-#, php-format
-msgid "Disk quota exceeded. You cannot upload files until you %s upgrade your storage"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/thank-you/index.phtml:16
-msgid "Thank you!"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/thank-you/index.phtml:17
-msgid "Your station has been upgraded successfully."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/thank-you/index.phtml:18
-msgid "Return to Airtime"
-msgstr ""
diff --git a/airtime_mvc/locale/es_ES/LC_MESSAGES/airtime.po b/airtime_mvc/locale/es_ES/LC_MESSAGES/airtime.po
index f6c35fb82..5dca46485 100644
--- a/airtime_mvc/locale/es_ES/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/es_ES/LC_MESSAGES/airtime.po
@@ -706,26 +706,6 @@ msgstr "Plantillas Historial"
 msgid "Listener Stats"
 msgstr "Estadísticas de oyentes"
 
-#: airtime_mvc/application/configs/navigation.php:144
-msgid "Upgrade"
-msgstr "Actualizar"
-
-#: airtime_mvc/application/configs/navigation.php:144
-msgid "Billing"
-msgstr "Facturación"
-
-#: airtime_mvc/application/configs/navigation.php:151
-msgid "Account Plans"
-msgstr "Planes de Cuenta"
-
-#: airtime_mvc/application/configs/navigation.php:158
-msgid "Account Details"
-msgstr "Detalles de Cuenta"
-
-#: airtime_mvc/application/configs/navigation.php:165
-msgid "View Invoices"
-msgstr "Ver Facturas"
-
 #: airtime_mvc/application/configs/navigation.php:175
 #: airtime_mvc/application/views/scripts/error/error-400.phtml:13
 #: airtime_mvc/application/views/scripts/error/error-403.phtml:13
@@ -2886,50 +2866,6 @@ msgstr "Tipo de usuario:"
 msgid "Login name is not unique."
 msgstr "El nombre de usuario no es único."
 
-#: airtime_mvc/application/forms/BillingClient.php:125
-msgid "What is the name of your favorite childhood friend?"
-msgstr "¿Cuál es el nombre de tu amigo de infancia favorito?"
-
-#: airtime_mvc/application/forms/BillingClient.php:126
-msgid "What school did you attend for sixth grade?"
-msgstr "¿A qué escuela asiste en Sexto de Primaria?"
-
-#: airtime_mvc/application/forms/BillingClient.php:127
-msgid "In what city did you meet your spouse/significant other?"
-msgstr "¿En qué ciudad conociste a tu cónyuge / pareja"
-
-#: airtime_mvc/application/forms/BillingClient.php:128
-msgid "What street did you live on in third grade?"
-msgstr "¿En qué calle vivías en Tercero de Primaria?"
-
-#: airtime_mvc/application/forms/BillingClient.php:129
-msgid "What is the first name of the boy or girl that you first kissed?"
-msgstr "¿Cuál es el nombre del niño o niña que besaste por primera vez?"
-
-#: airtime_mvc/application/forms/BillingClient.php:130
-msgid "In what city or town was your first job?"
-msgstr "¿En qué ciudad o pueblo fue tu primer trabajo?"
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:19
-msgid "Plan type:"
-msgstr "Tipo de plan:"
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:31
-msgid "Billing cycle:"
-msgstr "Ciclo de facturación:"
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:39
-msgid "Payment method:"
-msgstr "Método de Pago:"
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:42
-msgid "PayPal"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:43
-msgid "Credit Card via 2Checkout"
-msgstr "Tarjeta de crédito vía 2Checkout"
-
 #: airtime_mvc/application/forms/customvalidators/ConditionalNotEmpty.php:32
 #: airtime_mvc/application/forms/helpers/ValidationTypes.php:8
 msgid "Value is required and can't be empty"
@@ -4356,11 +4292,6 @@ msgstr "Selecciona Instancia del Show"
 msgid "Find"
 msgstr "Buscar"
 
-#: airtime_mvc/application/views/scripts/form/edit-user.phtml:7
-#, php-format
-msgid "<b>Note:</b> Since you're the station owner, your account information can be edited in <a href=\"%s\">Billing Settings</a> instead."
-msgstr "<b>Nota:</b> Puesto que eres el propietario de la estación, la información de tu cuenta se puede editar en <a href=\"%s\">Ajustes de Facturación</a>."
-
 #: airtime_mvc/application/views/scripts/form/login.phtml:41
 msgid "Forgot your password?"
 msgstr "¿Olvidaste tu contraseña?"
@@ -5101,11 +5032,6 @@ msgstr "Apellido"
 msgid "User Type"
 msgstr "Tipo de usuario"
 
-#: airtime_mvc/application/views/scripts/user/add-user.phtml:31
-#, php-format
-msgid "Super Admin details can be changed in your <a href=\"%s\">Billing Settings</a>."
-msgstr "Los detalles Super Admin se pueden cambiar en tu <a href=\"%s\">Configuración de facturación"
-
 #: airtime_mvc/application/views/scripts/webstream/webstream.phtml:30
 msgid "Stream URL:"
 msgstr "URL del stream:"
diff --git a/airtime_mvc/locale/es_ES/LC_MESSAGES/pro.po b/airtime_mvc/locale/es_ES/LC_MESSAGES/pro.po
deleted file mode 100644
index 2cb427894..000000000
--- a/airtime_mvc/locale/es_ES/LC_MESSAGES/pro.po
+++ /dev/null
@@ -1,143 +0,0 @@
-#: airtime_mvc/application/controllers/LoginController.php:188
-#, php-format
-msgid "That username or email address could not be found. If you are the station owner, you should <a href=\"%s\">reset your here</a>."
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:16
-msgid "First Name:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:25
-msgid "Last Name:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:34
-msgid "Company Name:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:43
-msgid "Email Address:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:53
-msgid "Address 1:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:62
-msgid "Address 2:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:69
-msgid "City:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:79
-msgid "State/Region:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:88
-msgid "Zip Code / Postal Code:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:101
-msgid "Country:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:111
-msgid "Phone Number:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:120
-msgid "Please choose a security question:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:134
-msgid "Please enter an answer:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:151
-msgid "VAT/Tax ID (EU only)"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:161
-msgid "Subscribe to Sourcefabric newsletter"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:171
-msgid "Password:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:180
-msgid "Verify Password:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:196
-msgid "Save"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/invoices.phtml:7
-msgid "<b>Thank you!</b> Your plan has been updated and you will be invoiced during your next billing cycle."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/invoices.phtml:11
-msgid "Tip: To pay an invoice, click \"View Invoice\" and look for the \"Checkout\" button."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:177
-msgid "Account Plans"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:178
-msgid "Upgrade today to get more listeners and storage space!"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:182
-msgid "Monthly Plans"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:316
-msgid "View Plans"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:318
-msgid "Your Current Plan:"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:332
-msgid "Choose a plan: "
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:358
-msgid "Please enter your payment details:"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/form/password-restore.phtml:5
-#, php-format
-msgid "If you are the primary owner of this station, <a href=\"%s\">please reset your password here</a>."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
-#, php-format
-msgid "Purchase an %s plan!"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
-msgid "My Account"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/plupload/index.phtml:9
-#, php-format
-msgid "Disk quota exceeded. You cannot upload files until you %s upgrade your storage"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/thank-you/index.phtml:16
-msgid "Thank you!"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/thank-you/index.phtml:17
-msgid "Your station has been upgraded successfully."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/thank-you/index.phtml:18
-msgid "Return to Airtime"
-msgstr ""
diff --git a/airtime_mvc/locale/fr_FR/LC_MESSAGES/airtime.po b/airtime_mvc/locale/fr_FR/LC_MESSAGES/airtime.po
index 9812992c7..740e6b2cc 100644
--- a/airtime_mvc/locale/fr_FR/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/fr_FR/LC_MESSAGES/airtime.po
@@ -703,26 +703,6 @@ msgstr "Modèle d'historique"
 msgid "Listener Stats"
 msgstr "Statistiques des Auditeurs"
 
-#: airtime_mvc/application/configs/navigation.php:144
-msgid "Upgrade"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:144
-msgid "Billing"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:151
-msgid "Account Plans"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:158
-msgid "Account Details"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:165
-msgid "View Invoices"
-msgstr ""
-
 #: airtime_mvc/application/configs/navigation.php:175
 #: airtime_mvc/application/views/scripts/error/error-400.phtml:13
 #: airtime_mvc/application/views/scripts/error/error-403.phtml:13
@@ -2876,50 +2856,6 @@ msgstr "Type d'Utilisateur:"
 msgid "Login name is not unique."
 msgstr "Le Nom de connexion n'est pas unique."
 
-#: airtime_mvc/application/forms/BillingClient.php:125
-msgid "What is the name of your favorite childhood friend?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:126
-msgid "What school did you attend for sixth grade?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:127
-msgid "In what city did you meet your spouse/significant other?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:128
-msgid "What street did you live on in third grade?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:129
-msgid "What is the first name of the boy or girl that you first kissed?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:130
-msgid "In what city or town was your first job?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:19
-msgid "Plan type:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:31
-msgid "Billing cycle:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:39
-msgid "Payment method:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:42
-msgid "PayPal"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:43
-msgid "Credit Card via 2Checkout"
-msgstr ""
-
 #: airtime_mvc/application/forms/customvalidators/ConditionalNotEmpty.php:32
 #: airtime_mvc/application/forms/helpers/ValidationTypes.php:8
 msgid "Value is required and can't be empty"
@@ -4326,11 +4262,6 @@ msgstr "Choisissez Afficher instance"
 msgid "Find"
 msgstr "Trouver"
 
-#: airtime_mvc/application/views/scripts/form/edit-user.phtml:7
-#, php-format
-msgid "<b>Note:</b> Since you're the station owner, your account information can be edited in <a href=\"%s\">Billing Settings</a> instead."
-msgstr ""
-
 #: airtime_mvc/application/views/scripts/form/login.phtml:41
 msgid "Forgot your password?"
 msgstr ""
@@ -5075,11 +5006,6 @@ msgstr "Nom"
 msgid "User Type"
 msgstr "Type d'Utilisateur"
 
-#: airtime_mvc/application/views/scripts/user/add-user.phtml:31
-#, php-format
-msgid "Super Admin details can be changed in your <a href=\"%s\">Billing Settings</a>."
-msgstr ""
-
 #: airtime_mvc/application/views/scripts/webstream/webstream.phtml:30
 msgid "Stream URL:"
 msgstr "URL du Flux:"
diff --git a/airtime_mvc/locale/fr_FR/LC_MESSAGES/pro.po b/airtime_mvc/locale/fr_FR/LC_MESSAGES/pro.po
deleted file mode 100644
index 2cb427894..000000000
--- a/airtime_mvc/locale/fr_FR/LC_MESSAGES/pro.po
+++ /dev/null
@@ -1,143 +0,0 @@
-#: airtime_mvc/application/controllers/LoginController.php:188
-#, php-format
-msgid "That username or email address could not be found. If you are the station owner, you should <a href=\"%s\">reset your here</a>."
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:16
-msgid "First Name:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:25
-msgid "Last Name:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:34
-msgid "Company Name:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:43
-msgid "Email Address:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:53
-msgid "Address 1:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:62
-msgid "Address 2:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:69
-msgid "City:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:79
-msgid "State/Region:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:88
-msgid "Zip Code / Postal Code:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:101
-msgid "Country:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:111
-msgid "Phone Number:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:120
-msgid "Please choose a security question:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:134
-msgid "Please enter an answer:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:151
-msgid "VAT/Tax ID (EU only)"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:161
-msgid "Subscribe to Sourcefabric newsletter"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:171
-msgid "Password:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:180
-msgid "Verify Password:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:196
-msgid "Save"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/invoices.phtml:7
-msgid "<b>Thank you!</b> Your plan has been updated and you will be invoiced during your next billing cycle."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/invoices.phtml:11
-msgid "Tip: To pay an invoice, click \"View Invoice\" and look for the \"Checkout\" button."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:177
-msgid "Account Plans"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:178
-msgid "Upgrade today to get more listeners and storage space!"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:182
-msgid "Monthly Plans"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:316
-msgid "View Plans"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:318
-msgid "Your Current Plan:"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:332
-msgid "Choose a plan: "
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:358
-msgid "Please enter your payment details:"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/form/password-restore.phtml:5
-#, php-format
-msgid "If you are the primary owner of this station, <a href=\"%s\">please reset your password here</a>."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
-#, php-format
-msgid "Purchase an %s plan!"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
-msgid "My Account"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/plupload/index.phtml:9
-#, php-format
-msgid "Disk quota exceeded. You cannot upload files until you %s upgrade your storage"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/thank-you/index.phtml:16
-msgid "Thank you!"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/thank-you/index.phtml:17
-msgid "Your station has been upgraded successfully."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/thank-you/index.phtml:18
-msgid "Return to Airtime"
-msgstr ""
diff --git a/airtime_mvc/locale/hr_HR/LC_MESSAGES/airtime.po b/airtime_mvc/locale/hr_HR/LC_MESSAGES/airtime.po
index 792e0566c..a9d955999 100644
--- a/airtime_mvc/locale/hr_HR/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/hr_HR/LC_MESSAGES/airtime.po
@@ -702,26 +702,6 @@ msgstr "Povijesni Predlošci"
 msgid "Listener Stats"
 msgstr "Slušateljska Statistika"
 
-#: airtime_mvc/application/configs/navigation.php:144
-msgid "Upgrade"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:144
-msgid "Billing"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:151
-msgid "Account Plans"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:158
-msgid "Account Details"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:165
-msgid "View Invoices"
-msgstr ""
-
 #: airtime_mvc/application/configs/navigation.php:175
 #: airtime_mvc/application/views/scripts/error/error-400.phtml:13
 #: airtime_mvc/application/views/scripts/error/error-403.phtml:13
@@ -2875,50 +2855,6 @@ msgstr "Vrsta Korisnika:"
 msgid "Login name is not unique."
 msgstr "Ime prijave nije jedinstveno."
 
-#: airtime_mvc/application/forms/BillingClient.php:125
-msgid "What is the name of your favorite childhood friend?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:126
-msgid "What school did you attend for sixth grade?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:127
-msgid "In what city did you meet your spouse/significant other?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:128
-msgid "What street did you live on in third grade?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:129
-msgid "What is the first name of the boy or girl that you first kissed?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:130
-msgid "In what city or town was your first job?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:19
-msgid "Plan type:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:31
-msgid "Billing cycle:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:39
-msgid "Payment method:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:42
-msgid "PayPal"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:43
-msgid "Credit Card via 2Checkout"
-msgstr ""
-
 #: airtime_mvc/application/forms/customvalidators/ConditionalNotEmpty.php:32
 #: airtime_mvc/application/forms/helpers/ValidationTypes.php:8
 msgid "Value is required and can't be empty"
@@ -4325,11 +4261,6 @@ msgstr "Odaberi Emisijsku Stupnju"
 msgid "Find"
 msgstr "Nađi"
 
-#: airtime_mvc/application/views/scripts/form/edit-user.phtml:7
-#, php-format
-msgid "<b>Note:</b> Since you're the station owner, your account information can be edited in <a href=\"%s\">Billing Settings</a> instead."
-msgstr ""
-
 #: airtime_mvc/application/views/scripts/form/login.phtml:41
 msgid "Forgot your password?"
 msgstr ""
@@ -5074,11 +5005,6 @@ msgstr "Prezime"
 msgid "User Type"
 msgstr "Tip Korisnika"
 
-#: airtime_mvc/application/views/scripts/user/add-user.phtml:31
-#, php-format
-msgid "Super Admin details can be changed in your <a href=\"%s\">Billing Settings</a>."
-msgstr ""
-
 #: airtime_mvc/application/views/scripts/webstream/webstream.phtml:30
 msgid "Stream URL:"
 msgstr "URL Prijenosa:"
diff --git a/airtime_mvc/locale/hr_HR/LC_MESSAGES/pro.po b/airtime_mvc/locale/hr_HR/LC_MESSAGES/pro.po
deleted file mode 100644
index 2cb427894..000000000
--- a/airtime_mvc/locale/hr_HR/LC_MESSAGES/pro.po
+++ /dev/null
@@ -1,143 +0,0 @@
-#: airtime_mvc/application/controllers/LoginController.php:188
-#, php-format
-msgid "That username or email address could not be found. If you are the station owner, you should <a href=\"%s\">reset your here</a>."
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:16
-msgid "First Name:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:25
-msgid "Last Name:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:34
-msgid "Company Name:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:43
-msgid "Email Address:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:53
-msgid "Address 1:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:62
-msgid "Address 2:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:69
-msgid "City:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:79
-msgid "State/Region:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:88
-msgid "Zip Code / Postal Code:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:101
-msgid "Country:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:111
-msgid "Phone Number:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:120
-msgid "Please choose a security question:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:134
-msgid "Please enter an answer:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:151
-msgid "VAT/Tax ID (EU only)"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:161
-msgid "Subscribe to Sourcefabric newsletter"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:171
-msgid "Password:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:180
-msgid "Verify Password:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:196
-msgid "Save"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/invoices.phtml:7
-msgid "<b>Thank you!</b> Your plan has been updated and you will be invoiced during your next billing cycle."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/invoices.phtml:11
-msgid "Tip: To pay an invoice, click \"View Invoice\" and look for the \"Checkout\" button."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:177
-msgid "Account Plans"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:178
-msgid "Upgrade today to get more listeners and storage space!"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:182
-msgid "Monthly Plans"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:316
-msgid "View Plans"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:318
-msgid "Your Current Plan:"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:332
-msgid "Choose a plan: "
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:358
-msgid "Please enter your payment details:"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/form/password-restore.phtml:5
-#, php-format
-msgid "If you are the primary owner of this station, <a href=\"%s\">please reset your password here</a>."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
-#, php-format
-msgid "Purchase an %s plan!"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
-msgid "My Account"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/plupload/index.phtml:9
-#, php-format
-msgid "Disk quota exceeded. You cannot upload files until you %s upgrade your storage"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/thank-you/index.phtml:16
-msgid "Thank you!"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/thank-you/index.phtml:17
-msgid "Your station has been upgraded successfully."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/thank-you/index.phtml:18
-msgid "Return to Airtime"
-msgstr ""
diff --git a/airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.po b/airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.po
index 0b6e8820b..447fb557b 100644
--- a/airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/hu_HU/LC_MESSAGES/airtime.po
@@ -727,26 +727,6 @@ msgstr "Naplózási sablonok"
 msgid "Listener Stats"
 msgstr "Hallgatói statisztikák"
 
-#: airtime_mvc/application/configs/navigation.php:144
-msgid "Upgrade"
-msgstr "Frissítés"
-
-#: airtime_mvc/application/configs/navigation.php:144
-msgid "Billing"
-msgstr "Számlázás"
-
-#: airtime_mvc/application/configs/navigation.php:151
-msgid "Account Plans"
-msgstr "Fióktervek"
-
-#: airtime_mvc/application/configs/navigation.php:158
-msgid "Account Details"
-msgstr "Fiók részletei"
-
-#: airtime_mvc/application/configs/navigation.php:165
-msgid "View Invoices"
-msgstr "Számlák megtekintése"
-
 #: airtime_mvc/application/configs/navigation.php:175
 #: airtime_mvc/application/views/scripts/error/error-400.phtml:13
 #: airtime_mvc/application/views/scripts/error/error-403.phtml:13
@@ -3041,50 +3021,6 @@ msgstr "Felhasználótípus:"
 msgid "Login name is not unique."
 msgstr "A bejelentkezési név nem egyedi."
 
-#: airtime_mvc/application/forms/BillingClient.php:125
-msgid "What is the name of your favorite childhood friend?"
-msgstr "Mi a legjobb gyerekkori barátja neve?"
-
-#: airtime_mvc/application/forms/BillingClient.php:126
-msgid "What school did you attend for sixth grade?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:127
-msgid "In what city did you meet your spouse/significant other?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:128
-msgid "What street did you live on in third grade?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:129
-msgid "What is the first name of the boy or girl that you first kissed?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:130
-msgid "In what city or town was your first job?"
-msgstr "Melyik városban volt az első munkahelye?"
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:19
-msgid "Plan type:"
-msgstr "Tervtípus:"
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:31
-msgid "Billing cycle:"
-msgstr "Számlázási ciklus:"
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:39
-msgid "Payment method:"
-msgstr "Fizetési mód:"
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:42
-msgid "PayPal"
-msgstr "PayPal"
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:43
-msgid "Credit Card via 2Checkout"
-msgstr "Hitelkártya 2Checkout-on keresztül"
-
 #: airtime_mvc/application/forms/customvalidators/ConditionalNotEmpty.php:32
 #: airtime_mvc/application/forms/helpers/ValidationTypes.php:8
 msgid "Value is required and can't be empty"
@@ -4590,13 +4526,6 @@ msgstr "Műsorpéldány kiválasztása"
 msgid "Find"
 msgstr "Találat"
 
-#: airtime_mvc/application/views/scripts/form/edit-user.phtml:7
-#, php-format
-msgid ""
-"<b>Note:</b> Since you're the station owner, your account information can be"
-" edited in <a href=\"%s\">Billing Settings</a> instead."
-msgstr ""
-
 #: airtime_mvc/application/views/scripts/form/login.phtml:41
 msgid "Forgot your password?"
 msgstr "Elfelejtett jelszó?"
@@ -5400,13 +5329,6 @@ msgstr "Keresztnév"
 msgid "User Type"
 msgstr "Felhasználótípus"
 
-#: airtime_mvc/application/views/scripts/user/add-user.phtml:31
-#, php-format
-msgid ""
-"Super Admin details can be changed in your <a href=\"%s\">Billing Settings</a"
-">."
-msgstr ""
-
 #: airtime_mvc/application/views/scripts/webstream/webstream.phtml:30
 msgid "Stream URL:"
 msgstr "Adásfolyam URL:"
diff --git a/airtime_mvc/locale/hu_HU/LC_MESSAGES/pro.po b/airtime_mvc/locale/hu_HU/LC_MESSAGES/pro.po
deleted file mode 100644
index 48e412a26..000000000
--- a/airtime_mvc/locale/hu_HU/LC_MESSAGES/pro.po
+++ /dev/null
@@ -1,156 +0,0 @@
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"POT-Creation-Date: \n"
-"PO-Revision-Date: \n"
-"Last-Translator: miles <varota@gmail.com>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: hu_HU\n"
-"X-Generator: Poedit 1.8.12\n"
-
-#: airtime_mvc/application/controllers/LoginController.php:188
-#, php-format
-msgid "That username or email address could not be found. If you are the station owner, you should <a href=\"%s\">reset your here</a>."
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:16
-msgid "First Name:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:25
-msgid "Last Name:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:34
-msgid "Company Name:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:43
-msgid "Email Address:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:53
-msgid "Address 1:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:62
-msgid "Address 2:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:69
-msgid "City:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:79
-msgid "State/Region:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:88
-msgid "Zip Code / Postal Code:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:101
-msgid "Country:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:111
-msgid "Phone Number:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:120
-msgid "Please choose a security question:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:134
-msgid "Please enter an answer:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:151
-msgid "VAT/Tax ID (EU only)"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:161
-msgid "Subscribe to Sourcefabric newsletter"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:171
-msgid "Password:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:180
-msgid "Verify Password:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:196
-msgid "Save"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/invoices.phtml:7
-msgid "<b>Thank you!</b> Your plan has been updated and you will be invoiced during your next billing cycle."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/invoices.phtml:11
-msgid "Tip: To pay an invoice, click \"View Invoice\" and look for the \"Checkout\" button."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:177
-msgid "Account Plans"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:178
-msgid "Upgrade today to get more listeners and storage space!"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:182
-msgid "Monthly Plans"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:316
-msgid "View Plans"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:318
-msgid "Your Current Plan:"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:332
-msgid "Choose a plan: "
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:358
-msgid "Please enter your payment details:"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/form/password-restore.phtml:5
-#, php-format
-msgid "If you are the primary owner of this station, <a href=\"%s\">please reset your password here</a>."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
-#, php-format
-msgid "Purchase an %s plan!"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
-msgid "My Account"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/plupload/index.phtml:9
-#, php-format
-msgid "Disk quota exceeded. You cannot upload files until you %s upgrade your storage"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/thank-you/index.phtml:16
-msgid "Thank you!"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/thank-you/index.phtml:17
-msgid "Your station has been upgraded successfully."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/thank-you/index.phtml:18
-msgid "Return to Airtime"
-msgstr ""
diff --git a/airtime_mvc/locale/hy/LC_MESSAGES/airtime.po b/airtime_mvc/locale/hy/LC_MESSAGES/airtime.po
index 278608fca..49520a6c0 100644
--- a/airtime_mvc/locale/hy/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/hy/LC_MESSAGES/airtime.po
@@ -698,26 +698,6 @@ msgstr ""
 msgid "Listener Stats"
 msgstr ""
 
-#: airtime_mvc/application/configs/navigation.php:144
-msgid "Upgrade"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:144
-msgid "Billing"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:151
-msgid "Account Plans"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:158
-msgid "Account Details"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:165
-msgid "View Invoices"
-msgstr ""
-
 #: airtime_mvc/application/configs/navigation.php:175
 #: airtime_mvc/application/views/scripts/error/error-400.phtml:13
 #: airtime_mvc/application/views/scripts/error/error-403.phtml:13
@@ -2869,50 +2849,6 @@ msgstr ""
 msgid "Login name is not unique."
 msgstr ""
 
-#: airtime_mvc/application/forms/BillingClient.php:125
-msgid "What is the name of your favorite childhood friend?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:126
-msgid "What school did you attend for sixth grade?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:127
-msgid "In what city did you meet your spouse/significant other?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:128
-msgid "What street did you live on in third grade?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:129
-msgid "What is the first name of the boy or girl that you first kissed?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:130
-msgid "In what city or town was your first job?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:19
-msgid "Plan type:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:31
-msgid "Billing cycle:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:39
-msgid "Payment method:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:42
-msgid "PayPal"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:43
-msgid "Credit Card via 2Checkout"
-msgstr ""
-
 #: airtime_mvc/application/forms/customvalidators/ConditionalNotEmpty.php:32
 #: airtime_mvc/application/forms/helpers/ValidationTypes.php:8
 msgid "Value is required and can't be empty"
@@ -4317,11 +4253,6 @@ msgstr ""
 msgid "Find"
 msgstr ""
 
-#: airtime_mvc/application/views/scripts/form/edit-user.phtml:7
-#, php-format
-msgid "<b>Note:</b> Since you're the station owner, your account information can be edited in <a href=\"%s\">Billing Settings</a> instead."
-msgstr ""
-
 #: airtime_mvc/application/views/scripts/form/login.phtml:41
 msgid "Forgot your password?"
 msgstr ""
@@ -5066,11 +4997,6 @@ msgstr ""
 msgid "User Type"
 msgstr ""
 
-#: airtime_mvc/application/views/scripts/user/add-user.phtml:31
-#, php-format
-msgid "Super Admin details can be changed in your <a href=\"%s\">Billing Settings</a>."
-msgstr ""
-
 #: airtime_mvc/application/views/scripts/webstream/webstream.phtml:30
 msgid "Stream URL:"
 msgstr ""
diff --git a/airtime_mvc/locale/hy/LC_MESSAGES/pro.po b/airtime_mvc/locale/hy/LC_MESSAGES/pro.po
deleted file mode 100644
index 2cb427894..000000000
--- a/airtime_mvc/locale/hy/LC_MESSAGES/pro.po
+++ /dev/null
@@ -1,143 +0,0 @@
-#: airtime_mvc/application/controllers/LoginController.php:188
-#, php-format
-msgid "That username or email address could not be found. If you are the station owner, you should <a href=\"%s\">reset your here</a>."
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:16
-msgid "First Name:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:25
-msgid "Last Name:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:34
-msgid "Company Name:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:43
-msgid "Email Address:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:53
-msgid "Address 1:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:62
-msgid "Address 2:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:69
-msgid "City:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:79
-msgid "State/Region:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:88
-msgid "Zip Code / Postal Code:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:101
-msgid "Country:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:111
-msgid "Phone Number:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:120
-msgid "Please choose a security question:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:134
-msgid "Please enter an answer:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:151
-msgid "VAT/Tax ID (EU only)"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:161
-msgid "Subscribe to Sourcefabric newsletter"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:171
-msgid "Password:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:180
-msgid "Verify Password:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:196
-msgid "Save"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/invoices.phtml:7
-msgid "<b>Thank you!</b> Your plan has been updated and you will be invoiced during your next billing cycle."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/invoices.phtml:11
-msgid "Tip: To pay an invoice, click \"View Invoice\" and look for the \"Checkout\" button."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:177
-msgid "Account Plans"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:178
-msgid "Upgrade today to get more listeners and storage space!"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:182
-msgid "Monthly Plans"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:316
-msgid "View Plans"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:318
-msgid "Your Current Plan:"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:332
-msgid "Choose a plan: "
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:358
-msgid "Please enter your payment details:"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/form/password-restore.phtml:5
-#, php-format
-msgid "If you are the primary owner of this station, <a href=\"%s\">please reset your password here</a>."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
-#, php-format
-msgid "Purchase an %s plan!"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
-msgid "My Account"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/plupload/index.phtml:9
-#, php-format
-msgid "Disk quota exceeded. You cannot upload files until you %s upgrade your storage"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/thank-you/index.phtml:16
-msgid "Thank you!"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/thank-you/index.phtml:17
-msgid "Your station has been upgraded successfully."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/thank-you/index.phtml:18
-msgid "Return to Airtime"
-msgstr ""
diff --git a/airtime_mvc/locale/hy_AM/LC_MESSAGES/airtime.po b/airtime_mvc/locale/hy_AM/LC_MESSAGES/airtime.po
index b2f5b80c4..883c51b18 100644
--- a/airtime_mvc/locale/hy_AM/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/hy_AM/LC_MESSAGES/airtime.po
@@ -701,26 +701,6 @@ msgstr ""
 msgid "Listener Stats"
 msgstr ""
 
-#: airtime_mvc/application/configs/navigation.php:144
-msgid "Upgrade"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:144
-msgid "Billing"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:151
-msgid "Account Plans"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:158
-msgid "Account Details"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:165
-msgid "View Invoices"
-msgstr ""
-
 #: airtime_mvc/application/configs/navigation.php:175
 #: airtime_mvc/application/views/scripts/error/error-400.phtml:13
 #: airtime_mvc/application/views/scripts/error/error-403.phtml:13
@@ -2872,50 +2852,6 @@ msgstr ""
 msgid "Login name is not unique."
 msgstr ""
 
-#: airtime_mvc/application/forms/BillingClient.php:125
-msgid "What is the name of your favorite childhood friend?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:126
-msgid "What school did you attend for sixth grade?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:127
-msgid "In what city did you meet your spouse/significant other?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:128
-msgid "What street did you live on in third grade?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:129
-msgid "What is the first name of the boy or girl that you first kissed?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:130
-msgid "In what city or town was your first job?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:19
-msgid "Plan type:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:31
-msgid "Billing cycle:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:39
-msgid "Payment method:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:42
-msgid "PayPal"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:43
-msgid "Credit Card via 2Checkout"
-msgstr ""
-
 #: airtime_mvc/application/forms/customvalidators/ConditionalNotEmpty.php:32
 #: airtime_mvc/application/forms/helpers/ValidationTypes.php:8
 msgid "Value is required and can't be empty"
@@ -4320,11 +4256,6 @@ msgstr ""
 msgid "Find"
 msgstr ""
 
-#: airtime_mvc/application/views/scripts/form/edit-user.phtml:7
-#, php-format
-msgid "<b>Note:</b> Since you're the station owner, your account information can be edited in <a href=\"%s\">Billing Settings</a> instead."
-msgstr ""
-
 #: airtime_mvc/application/views/scripts/form/login.phtml:41
 msgid "Forgot your password?"
 msgstr ""
@@ -5069,11 +5000,6 @@ msgstr ""
 msgid "User Type"
 msgstr ""
 
-#: airtime_mvc/application/views/scripts/user/add-user.phtml:31
-#, php-format
-msgid "Super Admin details can be changed in your <a href=\"%s\">Billing Settings</a>."
-msgstr ""
-
 #: airtime_mvc/application/views/scripts/webstream/webstream.phtml:30
 msgid "Stream URL:"
 msgstr ""
diff --git a/airtime_mvc/locale/hy_AM/LC_MESSAGES/pro.po b/airtime_mvc/locale/hy_AM/LC_MESSAGES/pro.po
deleted file mode 100644
index 2cb427894..000000000
--- a/airtime_mvc/locale/hy_AM/LC_MESSAGES/pro.po
+++ /dev/null
@@ -1,143 +0,0 @@
-#: airtime_mvc/application/controllers/LoginController.php:188
-#, php-format
-msgid "That username or email address could not be found. If you are the station owner, you should <a href=\"%s\">reset your here</a>."
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:16
-msgid "First Name:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:25
-msgid "Last Name:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:34
-msgid "Company Name:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:43
-msgid "Email Address:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:53
-msgid "Address 1:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:62
-msgid "Address 2:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:69
-msgid "City:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:79
-msgid "State/Region:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:88
-msgid "Zip Code / Postal Code:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:101
-msgid "Country:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:111
-msgid "Phone Number:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:120
-msgid "Please choose a security question:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:134
-msgid "Please enter an answer:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:151
-msgid "VAT/Tax ID (EU only)"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:161
-msgid "Subscribe to Sourcefabric newsletter"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:171
-msgid "Password:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:180
-msgid "Verify Password:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:196
-msgid "Save"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/invoices.phtml:7
-msgid "<b>Thank you!</b> Your plan has been updated and you will be invoiced during your next billing cycle."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/invoices.phtml:11
-msgid "Tip: To pay an invoice, click \"View Invoice\" and look for the \"Checkout\" button."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:177
-msgid "Account Plans"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:178
-msgid "Upgrade today to get more listeners and storage space!"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:182
-msgid "Monthly Plans"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:316
-msgid "View Plans"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:318
-msgid "Your Current Plan:"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:332
-msgid "Choose a plan: "
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:358
-msgid "Please enter your payment details:"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/form/password-restore.phtml:5
-#, php-format
-msgid "If you are the primary owner of this station, <a href=\"%s\">please reset your password here</a>."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
-#, php-format
-msgid "Purchase an %s plan!"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
-msgid "My Account"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/plupload/index.phtml:9
-#, php-format
-msgid "Disk quota exceeded. You cannot upload files until you %s upgrade your storage"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/thank-you/index.phtml:16
-msgid "Thank you!"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/thank-you/index.phtml:17
-msgid "Your station has been upgraded successfully."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/thank-you/index.phtml:18
-msgid "Return to Airtime"
-msgstr ""
diff --git a/airtime_mvc/locale/id_ID/LC_MESSAGES/airtime.po b/airtime_mvc/locale/id_ID/LC_MESSAGES/airtime.po
index 6349c5946..ee08119af 100644
--- a/airtime_mvc/locale/id_ID/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/id_ID/LC_MESSAGES/airtime.po
@@ -701,26 +701,6 @@ msgstr ""
 msgid "Listener Stats"
 msgstr ""
 
-#: airtime_mvc/application/configs/navigation.php:144
-msgid "Upgrade"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:144
-msgid "Billing"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:151
-msgid "Account Plans"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:158
-msgid "Account Details"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:165
-msgid "View Invoices"
-msgstr ""
-
 #: airtime_mvc/application/configs/navigation.php:175
 #: airtime_mvc/application/views/scripts/error/error-400.phtml:13
 #: airtime_mvc/application/views/scripts/error/error-403.phtml:13
@@ -2872,50 +2852,6 @@ msgstr ""
 msgid "Login name is not unique."
 msgstr ""
 
-#: airtime_mvc/application/forms/BillingClient.php:125
-msgid "What is the name of your favorite childhood friend?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:126
-msgid "What school did you attend for sixth grade?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:127
-msgid "In what city did you meet your spouse/significant other?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:128
-msgid "What street did you live on in third grade?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:129
-msgid "What is the first name of the boy or girl that you first kissed?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:130
-msgid "In what city or town was your first job?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:19
-msgid "Plan type:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:31
-msgid "Billing cycle:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:39
-msgid "Payment method:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:42
-msgid "PayPal"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:43
-msgid "Credit Card via 2Checkout"
-msgstr ""
-
 #: airtime_mvc/application/forms/customvalidators/ConditionalNotEmpty.php:32
 #: airtime_mvc/application/forms/helpers/ValidationTypes.php:8
 msgid "Value is required and can't be empty"
@@ -4320,11 +4256,6 @@ msgstr ""
 msgid "Find"
 msgstr ""
 
-#: airtime_mvc/application/views/scripts/form/edit-user.phtml:7
-#, php-format
-msgid "<b>Note:</b> Since you're the station owner, your account information can be edited in <a href=\"%s\">Billing Settings</a> instead."
-msgstr ""
-
 #: airtime_mvc/application/views/scripts/form/login.phtml:41
 msgid "Forgot your password?"
 msgstr ""
@@ -5069,11 +5000,6 @@ msgstr ""
 msgid "User Type"
 msgstr ""
 
-#: airtime_mvc/application/views/scripts/user/add-user.phtml:31
-#, php-format
-msgid "Super Admin details can be changed in your <a href=\"%s\">Billing Settings</a>."
-msgstr ""
-
 #: airtime_mvc/application/views/scripts/webstream/webstream.phtml:30
 msgid "Stream URL:"
 msgstr ""
diff --git a/airtime_mvc/locale/it_IT/LC_MESSAGES/airtime.po b/airtime_mvc/locale/it_IT/LC_MESSAGES/airtime.po
index c7d820d86..8b30fa7ba 100644
--- a/airtime_mvc/locale/it_IT/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/it_IT/LC_MESSAGES/airtime.po
@@ -704,26 +704,6 @@ msgstr ""
 msgid "Listener Stats"
 msgstr "Statistiche ascolto"
 
-#: airtime_mvc/application/configs/navigation.php:144
-msgid "Upgrade"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:144
-msgid "Billing"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:151
-msgid "Account Plans"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:158
-msgid "Account Details"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:165
-msgid "View Invoices"
-msgstr ""
-
 #: airtime_mvc/application/configs/navigation.php:175
 #: airtime_mvc/application/views/scripts/error/error-400.phtml:13
 #: airtime_mvc/application/views/scripts/error/error-403.phtml:13
@@ -2877,50 +2857,6 @@ msgstr "tipo di utente:"
 msgid "Login name is not unique."
 msgstr "Il nome utente esiste già ."
 
-#: airtime_mvc/application/forms/BillingClient.php:125
-msgid "What is the name of your favorite childhood friend?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:126
-msgid "What school did you attend for sixth grade?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:127
-msgid "In what city did you meet your spouse/significant other?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:128
-msgid "What street did you live on in third grade?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:129
-msgid "What is the first name of the boy or girl that you first kissed?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:130
-msgid "In what city or town was your first job?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:19
-msgid "Plan type:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:31
-msgid "Billing cycle:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:39
-msgid "Payment method:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:42
-msgid "PayPal"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:43
-msgid "Credit Card via 2Checkout"
-msgstr ""
-
 #: airtime_mvc/application/forms/customvalidators/ConditionalNotEmpty.php:32
 #: airtime_mvc/application/forms/helpers/ValidationTypes.php:8
 msgid "Value is required and can't be empty"
@@ -4327,11 +4263,6 @@ msgstr ""
 msgid "Find"
 msgstr ""
 
-#: airtime_mvc/application/views/scripts/form/edit-user.phtml:7
-#, php-format
-msgid "<b>Note:</b> Since you're the station owner, your account information can be edited in <a href=\"%s\">Billing Settings</a> instead."
-msgstr ""
-
 #: airtime_mvc/application/views/scripts/form/login.phtml:41
 msgid "Forgot your password?"
 msgstr ""
@@ -5076,11 +5007,6 @@ msgstr "Cognome"
 msgid "User Type"
 msgstr "Tipo di utente"
 
-#: airtime_mvc/application/views/scripts/user/add-user.phtml:31
-#, php-format
-msgid "Super Admin details can be changed in your <a href=\"%s\">Billing Settings</a>."
-msgstr ""
-
 #: airtime_mvc/application/views/scripts/webstream/webstream.phtml:30
 msgid "Stream URL:"
 msgstr "Stream URL:"
diff --git a/airtime_mvc/locale/it_IT/LC_MESSAGES/pro.po b/airtime_mvc/locale/it_IT/LC_MESSAGES/pro.po
deleted file mode 100644
index 2cb427894..000000000
--- a/airtime_mvc/locale/it_IT/LC_MESSAGES/pro.po
+++ /dev/null
@@ -1,143 +0,0 @@
-#: airtime_mvc/application/controllers/LoginController.php:188
-#, php-format
-msgid "That username or email address could not be found. If you are the station owner, you should <a href=\"%s\">reset your here</a>."
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:16
-msgid "First Name:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:25
-msgid "Last Name:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:34
-msgid "Company Name:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:43
-msgid "Email Address:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:53
-msgid "Address 1:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:62
-msgid "Address 2:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:69
-msgid "City:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:79
-msgid "State/Region:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:88
-msgid "Zip Code / Postal Code:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:101
-msgid "Country:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:111
-msgid "Phone Number:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:120
-msgid "Please choose a security question:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:134
-msgid "Please enter an answer:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:151
-msgid "VAT/Tax ID (EU only)"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:161
-msgid "Subscribe to Sourcefabric newsletter"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:171
-msgid "Password:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:180
-msgid "Verify Password:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:196
-msgid "Save"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/invoices.phtml:7
-msgid "<b>Thank you!</b> Your plan has been updated and you will be invoiced during your next billing cycle."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/invoices.phtml:11
-msgid "Tip: To pay an invoice, click \"View Invoice\" and look for the \"Checkout\" button."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:177
-msgid "Account Plans"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:178
-msgid "Upgrade today to get more listeners and storage space!"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:182
-msgid "Monthly Plans"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:316
-msgid "View Plans"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:318
-msgid "Your Current Plan:"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:332
-msgid "Choose a plan: "
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:358
-msgid "Please enter your payment details:"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/form/password-restore.phtml:5
-#, php-format
-msgid "If you are the primary owner of this station, <a href=\"%s\">please reset your password here</a>."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
-#, php-format
-msgid "Purchase an %s plan!"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
-msgid "My Account"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/plupload/index.phtml:9
-#, php-format
-msgid "Disk quota exceeded. You cannot upload files until you %s upgrade your storage"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/thank-you/index.phtml:16
-msgid "Thank you!"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/thank-you/index.phtml:17
-msgid "Your station has been upgraded successfully."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/thank-you/index.phtml:18
-msgid "Return to Airtime"
-msgstr ""
diff --git a/airtime_mvc/locale/ja/LC_MESSAGES/airtime.po b/airtime_mvc/locale/ja/LC_MESSAGES/airtime.po
index 11228a3c8..5794a6c66 100644
--- a/airtime_mvc/locale/ja/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/ja/LC_MESSAGES/airtime.po
@@ -704,26 +704,6 @@ msgstr "配信履歴のテンプレート"
 msgid "Listener Stats"
 msgstr "リスナー統計"
 
-#: airtime_mvc/application/configs/navigation.php:144
-msgid "Upgrade"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:144
-msgid "Billing"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:151
-msgid "Account Plans"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:158
-msgid "Account Details"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:165
-msgid "View Invoices"
-msgstr ""
-
 #: airtime_mvc/application/configs/navigation.php:175
 #: airtime_mvc/application/views/scripts/error/error-400.phtml:13
 #: airtime_mvc/application/views/scripts/error/error-403.phtml:13
@@ -2875,50 +2855,6 @@ msgstr "ユーザー種別："
 msgid "Login name is not unique."
 msgstr "ログイン名はすでに使用されています。"
 
-#: airtime_mvc/application/forms/BillingClient.php:125
-msgid "What is the name of your favorite childhood friend?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:126
-msgid "What school did you attend for sixth grade?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:127
-msgid "In what city did you meet your spouse/significant other?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:128
-msgid "What street did you live on in third grade?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:129
-msgid "What is the first name of the boy or girl that you first kissed?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:130
-msgid "In what city or town was your first job?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:19
-msgid "Plan type:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:31
-msgid "Billing cycle:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:39
-msgid "Payment method:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:42
-msgid "PayPal"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:43
-msgid "Credit Card via 2Checkout"
-msgstr ""
-
 #: airtime_mvc/application/forms/customvalidators/ConditionalNotEmpty.php:32
 #: airtime_mvc/application/forms/helpers/ValidationTypes.php:8
 msgid "Value is required and can't be empty"
@@ -4325,11 +4261,6 @@ msgstr "番組配信回の選択"
 msgid "Find"
 msgstr "検索"
 
-#: airtime_mvc/application/views/scripts/form/edit-user.phtml:7
-#, php-format
-msgid "<b>Note:</b> Since you're the station owner, your account information can be edited in <a href=\"%s\">Billing Settings</a> instead."
-msgstr ""
-
 #: airtime_mvc/application/views/scripts/form/login.phtml:41
 msgid "Forgot your password?"
 msgstr ""
@@ -5074,11 +5005,6 @@ msgstr "姓"
 msgid "User Type"
 msgstr "ユーザー種別"
 
-#: airtime_mvc/application/views/scripts/user/add-user.phtml:31
-#, php-format
-msgid "Super Admin details can be changed in your <a href=\"%s\">Billing Settings</a>."
-msgstr ""
-
 #: airtime_mvc/application/views/scripts/webstream/webstream.phtml:30
 msgid "Stream URL:"
 msgstr "配信元URL："
diff --git a/airtime_mvc/locale/ja/LC_MESSAGES/pro.po b/airtime_mvc/locale/ja/LC_MESSAGES/pro.po
deleted file mode 100644
index 2cb427894..000000000
--- a/airtime_mvc/locale/ja/LC_MESSAGES/pro.po
+++ /dev/null
@@ -1,143 +0,0 @@
-#: airtime_mvc/application/controllers/LoginController.php:188
-#, php-format
-msgid "That username or email address could not be found. If you are the station owner, you should <a href=\"%s\">reset your here</a>."
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:16
-msgid "First Name:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:25
-msgid "Last Name:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:34
-msgid "Company Name:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:43
-msgid "Email Address:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:53
-msgid "Address 1:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:62
-msgid "Address 2:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:69
-msgid "City:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:79
-msgid "State/Region:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:88
-msgid "Zip Code / Postal Code:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:101
-msgid "Country:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:111
-msgid "Phone Number:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:120
-msgid "Please choose a security question:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:134
-msgid "Please enter an answer:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:151
-msgid "VAT/Tax ID (EU only)"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:161
-msgid "Subscribe to Sourcefabric newsletter"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:171
-msgid "Password:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:180
-msgid "Verify Password:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:196
-msgid "Save"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/invoices.phtml:7
-msgid "<b>Thank you!</b> Your plan has been updated and you will be invoiced during your next billing cycle."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/invoices.phtml:11
-msgid "Tip: To pay an invoice, click \"View Invoice\" and look for the \"Checkout\" button."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:177
-msgid "Account Plans"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:178
-msgid "Upgrade today to get more listeners and storage space!"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:182
-msgid "Monthly Plans"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:316
-msgid "View Plans"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:318
-msgid "Your Current Plan:"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:332
-msgid "Choose a plan: "
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:358
-msgid "Please enter your payment details:"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/form/password-restore.phtml:5
-#, php-format
-msgid "If you are the primary owner of this station, <a href=\"%s\">please reset your password here</a>."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
-#, php-format
-msgid "Purchase an %s plan!"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
-msgid "My Account"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/plupload/index.phtml:9
-#, php-format
-msgid "Disk quota exceeded. You cannot upload files until you %s upgrade your storage"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/thank-you/index.phtml:16
-msgid "Thank you!"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/thank-you/index.phtml:17
-msgid "Your station has been upgraded successfully."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/thank-you/index.phtml:18
-msgid "Return to Airtime"
-msgstr ""
diff --git a/airtime_mvc/locale/ja_JP/LC_MESSAGES/airtime.po b/airtime_mvc/locale/ja_JP/LC_MESSAGES/airtime.po
index 2a1c16f5e..3b8229590 100644
--- a/airtime_mvc/locale/ja_JP/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/ja_JP/LC_MESSAGES/airtime.po
@@ -699,26 +699,6 @@ msgstr ""
 msgid "Listener Stats"
 msgstr ""
 
-#: airtime_mvc/application/configs/navigation.php:144
-msgid "Upgrade"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:144
-msgid "Billing"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:151
-msgid "Account Plans"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:158
-msgid "Account Details"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:165
-msgid "View Invoices"
-msgstr ""
-
 #: airtime_mvc/application/configs/navigation.php:175
 #: airtime_mvc/application/views/scripts/error/error-400.phtml:13
 #: airtime_mvc/application/views/scripts/error/error-403.phtml:13
@@ -2870,50 +2850,6 @@ msgstr ""
 msgid "Login name is not unique."
 msgstr ""
 
-#: airtime_mvc/application/forms/BillingClient.php:125
-msgid "What is the name of your favorite childhood friend?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:126
-msgid "What school did you attend for sixth grade?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:127
-msgid "In what city did you meet your spouse/significant other?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:128
-msgid "What street did you live on in third grade?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:129
-msgid "What is the first name of the boy or girl that you first kissed?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:130
-msgid "In what city or town was your first job?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:19
-msgid "Plan type:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:31
-msgid "Billing cycle:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:39
-msgid "Payment method:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:42
-msgid "PayPal"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:43
-msgid "Credit Card via 2Checkout"
-msgstr ""
-
 #: airtime_mvc/application/forms/customvalidators/ConditionalNotEmpty.php:32
 #: airtime_mvc/application/forms/helpers/ValidationTypes.php:8
 msgid "Value is required and can't be empty"
@@ -4318,11 +4254,6 @@ msgstr ""
 msgid "Find"
 msgstr ""
 
-#: airtime_mvc/application/views/scripts/form/edit-user.phtml:7
-#, php-format
-msgid "<b>Note:</b> Since you're the station owner, your account information can be edited in <a href=\"%s\">Billing Settings</a> instead."
-msgstr ""
-
 #: airtime_mvc/application/views/scripts/form/login.phtml:41
 msgid "Forgot your password?"
 msgstr ""
@@ -5067,11 +4998,6 @@ msgstr ""
 msgid "User Type"
 msgstr ""
 
-#: airtime_mvc/application/views/scripts/user/add-user.phtml:31
-#, php-format
-msgid "Super Admin details can be changed in your <a href=\"%s\">Billing Settings</a>."
-msgstr ""
-
 #: airtime_mvc/application/views/scripts/webstream/webstream.phtml:30
 msgid "Stream URL:"
 msgstr ""
diff --git a/airtime_mvc/locale/ja_JP/LC_MESSAGES/pro.po b/airtime_mvc/locale/ja_JP/LC_MESSAGES/pro.po
deleted file mode 100644
index 2cb427894..000000000
--- a/airtime_mvc/locale/ja_JP/LC_MESSAGES/pro.po
+++ /dev/null
@@ -1,143 +0,0 @@
-#: airtime_mvc/application/controllers/LoginController.php:188
-#, php-format
-msgid "That username or email address could not be found. If you are the station owner, you should <a href=\"%s\">reset your here</a>."
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:16
-msgid "First Name:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:25
-msgid "Last Name:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:34
-msgid "Company Name:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:43
-msgid "Email Address:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:53
-msgid "Address 1:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:62
-msgid "Address 2:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:69
-msgid "City:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:79
-msgid "State/Region:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:88
-msgid "Zip Code / Postal Code:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:101
-msgid "Country:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:111
-msgid "Phone Number:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:120
-msgid "Please choose a security question:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:134
-msgid "Please enter an answer:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:151
-msgid "VAT/Tax ID (EU only)"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:161
-msgid "Subscribe to Sourcefabric newsletter"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:171
-msgid "Password:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:180
-msgid "Verify Password:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:196
-msgid "Save"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/invoices.phtml:7
-msgid "<b>Thank you!</b> Your plan has been updated and you will be invoiced during your next billing cycle."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/invoices.phtml:11
-msgid "Tip: To pay an invoice, click \"View Invoice\" and look for the \"Checkout\" button."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:177
-msgid "Account Plans"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:178
-msgid "Upgrade today to get more listeners and storage space!"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:182
-msgid "Monthly Plans"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:316
-msgid "View Plans"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:318
-msgid "Your Current Plan:"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:332
-msgid "Choose a plan: "
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:358
-msgid "Please enter your payment details:"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/form/password-restore.phtml:5
-#, php-format
-msgid "If you are the primary owner of this station, <a href=\"%s\">please reset your password here</a>."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
-#, php-format
-msgid "Purchase an %s plan!"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
-msgid "My Account"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/plupload/index.phtml:9
-#, php-format
-msgid "Disk quota exceeded. You cannot upload files until you %s upgrade your storage"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/thank-you/index.phtml:16
-msgid "Thank you!"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/thank-you/index.phtml:17
-msgid "Your station has been upgraded successfully."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/thank-you/index.phtml:18
-msgid "Return to Airtime"
-msgstr ""
diff --git a/airtime_mvc/locale/ka/LC_MESSAGES/airtime.po b/airtime_mvc/locale/ka/LC_MESSAGES/airtime.po
index 0a51b2105..10d80215a 100644
--- a/airtime_mvc/locale/ka/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/ka/LC_MESSAGES/airtime.po
@@ -701,26 +701,6 @@ msgstr ""
 msgid "Listener Stats"
 msgstr ""
 
-#: airtime_mvc/application/configs/navigation.php:144
-msgid "Upgrade"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:144
-msgid "Billing"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:151
-msgid "Account Plans"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:158
-msgid "Account Details"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:165
-msgid "View Invoices"
-msgstr ""
-
 #: airtime_mvc/application/configs/navigation.php:175
 #: airtime_mvc/application/views/scripts/error/error-400.phtml:13
 #: airtime_mvc/application/views/scripts/error/error-403.phtml:13
@@ -2872,50 +2852,6 @@ msgstr ""
 msgid "Login name is not unique."
 msgstr ""
 
-#: airtime_mvc/application/forms/BillingClient.php:125
-msgid "What is the name of your favorite childhood friend?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:126
-msgid "What school did you attend for sixth grade?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:127
-msgid "In what city did you meet your spouse/significant other?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:128
-msgid "What street did you live on in third grade?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:129
-msgid "What is the first name of the boy or girl that you first kissed?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:130
-msgid "In what city or town was your first job?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:19
-msgid "Plan type:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:31
-msgid "Billing cycle:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:39
-msgid "Payment method:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:42
-msgid "PayPal"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:43
-msgid "Credit Card via 2Checkout"
-msgstr ""
-
 #: airtime_mvc/application/forms/customvalidators/ConditionalNotEmpty.php:32
 #: airtime_mvc/application/forms/helpers/ValidationTypes.php:8
 msgid "Value is required and can't be empty"
@@ -4320,11 +4256,6 @@ msgstr ""
 msgid "Find"
 msgstr ""
 
-#: airtime_mvc/application/views/scripts/form/edit-user.phtml:7
-#, php-format
-msgid "<b>Note:</b> Since you're the station owner, your account information can be edited in <a href=\"%s\">Billing Settings</a> instead."
-msgstr ""
-
 #: airtime_mvc/application/views/scripts/form/login.phtml:41
 msgid "Forgot your password?"
 msgstr ""
@@ -5069,11 +5000,6 @@ msgstr ""
 msgid "User Type"
 msgstr ""
 
-#: airtime_mvc/application/views/scripts/user/add-user.phtml:31
-#, php-format
-msgid "Super Admin details can be changed in your <a href=\"%s\">Billing Settings</a>."
-msgstr ""
-
 #: airtime_mvc/application/views/scripts/webstream/webstream.phtml:30
 msgid "Stream URL:"
 msgstr ""
diff --git a/airtime_mvc/locale/ka/LC_MESSAGES/pro.po b/airtime_mvc/locale/ka/LC_MESSAGES/pro.po
deleted file mode 100644
index 2cb427894..000000000
--- a/airtime_mvc/locale/ka/LC_MESSAGES/pro.po
+++ /dev/null
@@ -1,143 +0,0 @@
-#: airtime_mvc/application/controllers/LoginController.php:188
-#, php-format
-msgid "That username or email address could not be found. If you are the station owner, you should <a href=\"%s\">reset your here</a>."
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:16
-msgid "First Name:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:25
-msgid "Last Name:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:34
-msgid "Company Name:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:43
-msgid "Email Address:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:53
-msgid "Address 1:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:62
-msgid "Address 2:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:69
-msgid "City:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:79
-msgid "State/Region:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:88
-msgid "Zip Code / Postal Code:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:101
-msgid "Country:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:111
-msgid "Phone Number:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:120
-msgid "Please choose a security question:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:134
-msgid "Please enter an answer:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:151
-msgid "VAT/Tax ID (EU only)"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:161
-msgid "Subscribe to Sourcefabric newsletter"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:171
-msgid "Password:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:180
-msgid "Verify Password:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:196
-msgid "Save"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/invoices.phtml:7
-msgid "<b>Thank you!</b> Your plan has been updated and you will be invoiced during your next billing cycle."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/invoices.phtml:11
-msgid "Tip: To pay an invoice, click \"View Invoice\" and look for the \"Checkout\" button."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:177
-msgid "Account Plans"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:178
-msgid "Upgrade today to get more listeners and storage space!"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:182
-msgid "Monthly Plans"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:316
-msgid "View Plans"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:318
-msgid "Your Current Plan:"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:332
-msgid "Choose a plan: "
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:358
-msgid "Please enter your payment details:"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/form/password-restore.phtml:5
-#, php-format
-msgid "If you are the primary owner of this station, <a href=\"%s\">please reset your password here</a>."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
-#, php-format
-msgid "Purchase an %s plan!"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
-msgid "My Account"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/plupload/index.phtml:9
-#, php-format
-msgid "Disk quota exceeded. You cannot upload files until you %s upgrade your storage"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/thank-you/index.phtml:16
-msgid "Thank you!"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/thank-you/index.phtml:17
-msgid "Your station has been upgraded successfully."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/thank-you/index.phtml:18
-msgid "Return to Airtime"
-msgstr ""
diff --git a/airtime_mvc/locale/ko_KR/LC_MESSAGES/airtime.po b/airtime_mvc/locale/ko_KR/LC_MESSAGES/airtime.po
index 2aa42936e..09e84cdbc 100644
--- a/airtime_mvc/locale/ko_KR/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/ko_KR/LC_MESSAGES/airtime.po
@@ -702,26 +702,6 @@ msgstr ""
 msgid "Listener Stats"
 msgstr "청취자 통계"
 
-#: airtime_mvc/application/configs/navigation.php:144
-msgid "Upgrade"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:144
-msgid "Billing"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:151
-msgid "Account Plans"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:158
-msgid "Account Details"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:165
-msgid "View Invoices"
-msgstr ""
-
 #: airtime_mvc/application/configs/navigation.php:175
 #: airtime_mvc/application/views/scripts/error/error-400.phtml:13
 #: airtime_mvc/application/views/scripts/error/error-403.phtml:13
@@ -2873,50 +2853,6 @@ msgstr "유저 타입"
 msgid "Login name is not unique."
 msgstr "사용할수 없는 아이디 입니다"
 
-#: airtime_mvc/application/forms/BillingClient.php:125
-msgid "What is the name of your favorite childhood friend?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:126
-msgid "What school did you attend for sixth grade?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:127
-msgid "In what city did you meet your spouse/significant other?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:128
-msgid "What street did you live on in third grade?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:129
-msgid "What is the first name of the boy or girl that you first kissed?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:130
-msgid "In what city or town was your first job?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:19
-msgid "Plan type:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:31
-msgid "Billing cycle:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:39
-msgid "Payment method:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:42
-msgid "PayPal"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:43
-msgid "Credit Card via 2Checkout"
-msgstr ""
-
 #: airtime_mvc/application/forms/customvalidators/ConditionalNotEmpty.php:32
 #: airtime_mvc/application/forms/helpers/ValidationTypes.php:8
 msgid "Value is required and can't be empty"
@@ -4323,11 +4259,6 @@ msgstr ""
 msgid "Find"
 msgstr ""
 
-#: airtime_mvc/application/views/scripts/form/edit-user.phtml:7
-#, php-format
-msgid "<b>Note:</b> Since you're the station owner, your account information can be edited in <a href=\"%s\">Billing Settings</a> instead."
-msgstr ""
-
 #: airtime_mvc/application/views/scripts/form/login.phtml:41
 msgid "Forgot your password?"
 msgstr ""
@@ -5072,11 +5003,6 @@ msgstr "성"
 msgid "User Type"
 msgstr "사용자  유형"
 
-#: airtime_mvc/application/views/scripts/user/add-user.phtml:31
-#, php-format
-msgid "Super Admin details can be changed in your <a href=\"%s\">Billing Settings</a>."
-msgstr ""
-
 #: airtime_mvc/application/views/scripts/webstream/webstream.phtml:30
 msgid "Stream URL:"
 msgstr "스트림 URL:"
diff --git a/airtime_mvc/locale/ko_KR/LC_MESSAGES/pro.po b/airtime_mvc/locale/ko_KR/LC_MESSAGES/pro.po
deleted file mode 100644
index 2cb427894..000000000
--- a/airtime_mvc/locale/ko_KR/LC_MESSAGES/pro.po
+++ /dev/null
@@ -1,143 +0,0 @@
-#: airtime_mvc/application/controllers/LoginController.php:188
-#, php-format
-msgid "That username or email address could not be found. If you are the station owner, you should <a href=\"%s\">reset your here</a>."
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:16
-msgid "First Name:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:25
-msgid "Last Name:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:34
-msgid "Company Name:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:43
-msgid "Email Address:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:53
-msgid "Address 1:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:62
-msgid "Address 2:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:69
-msgid "City:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:79
-msgid "State/Region:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:88
-msgid "Zip Code / Postal Code:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:101
-msgid "Country:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:111
-msgid "Phone Number:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:120
-msgid "Please choose a security question:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:134
-msgid "Please enter an answer:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:151
-msgid "VAT/Tax ID (EU only)"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:161
-msgid "Subscribe to Sourcefabric newsletter"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:171
-msgid "Password:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:180
-msgid "Verify Password:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:196
-msgid "Save"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/invoices.phtml:7
-msgid "<b>Thank you!</b> Your plan has been updated and you will be invoiced during your next billing cycle."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/invoices.phtml:11
-msgid "Tip: To pay an invoice, click \"View Invoice\" and look for the \"Checkout\" button."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:177
-msgid "Account Plans"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:178
-msgid "Upgrade today to get more listeners and storage space!"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:182
-msgid "Monthly Plans"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:316
-msgid "View Plans"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:318
-msgid "Your Current Plan:"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:332
-msgid "Choose a plan: "
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:358
-msgid "Please enter your payment details:"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/form/password-restore.phtml:5
-#, php-format
-msgid "If you are the primary owner of this station, <a href=\"%s\">please reset your password here</a>."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
-#, php-format
-msgid "Purchase an %s plan!"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
-msgid "My Account"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/plupload/index.phtml:9
-#, php-format
-msgid "Disk quota exceeded. You cannot upload files until you %s upgrade your storage"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/thank-you/index.phtml:16
-msgid "Thank you!"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/thank-you/index.phtml:17
-msgid "Your station has been upgraded successfully."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/thank-you/index.phtml:18
-msgid "Return to Airtime"
-msgstr ""
diff --git a/airtime_mvc/locale/lt/LC_MESSAGES/airtime.po b/airtime_mvc/locale/lt/LC_MESSAGES/airtime.po
index bc32ea60c..66aa5778f 100644
--- a/airtime_mvc/locale/lt/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/lt/LC_MESSAGES/airtime.po
@@ -702,26 +702,6 @@ msgstr ""
 msgid "Listener Stats"
 msgstr ""
 
-#: airtime_mvc/application/configs/navigation.php:144
-msgid "Upgrade"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:144
-msgid "Billing"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:151
-msgid "Account Plans"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:158
-msgid "Account Details"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:165
-msgid "View Invoices"
-msgstr ""
-
 #: airtime_mvc/application/configs/navigation.php:175
 #: airtime_mvc/application/views/scripts/error/error-400.phtml:13
 #: airtime_mvc/application/views/scripts/error/error-403.phtml:13
@@ -2873,50 +2853,6 @@ msgstr ""
 msgid "Login name is not unique."
 msgstr ""
 
-#: airtime_mvc/application/forms/BillingClient.php:125
-msgid "What is the name of your favorite childhood friend?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:126
-msgid "What school did you attend for sixth grade?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:127
-msgid "In what city did you meet your spouse/significant other?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:128
-msgid "What street did you live on in third grade?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:129
-msgid "What is the first name of the boy or girl that you first kissed?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:130
-msgid "In what city or town was your first job?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:19
-msgid "Plan type:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:31
-msgid "Billing cycle:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:39
-msgid "Payment method:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:42
-msgid "PayPal"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:43
-msgid "Credit Card via 2Checkout"
-msgstr ""
-
 #: airtime_mvc/application/forms/customvalidators/ConditionalNotEmpty.php:32
 #: airtime_mvc/application/forms/helpers/ValidationTypes.php:8
 msgid "Value is required and can't be empty"
@@ -4321,11 +4257,6 @@ msgstr ""
 msgid "Find"
 msgstr ""
 
-#: airtime_mvc/application/views/scripts/form/edit-user.phtml:7
-#, php-format
-msgid "<b>Note:</b> Since you're the station owner, your account information can be edited in <a href=\"%s\">Billing Settings</a> instead."
-msgstr ""
-
 #: airtime_mvc/application/views/scripts/form/login.phtml:41
 msgid "Forgot your password?"
 msgstr ""
@@ -5070,11 +5001,6 @@ msgstr ""
 msgid "User Type"
 msgstr ""
 
-#: airtime_mvc/application/views/scripts/user/add-user.phtml:31
-#, php-format
-msgid "Super Admin details can be changed in your <a href=\"%s\">Billing Settings</a>."
-msgstr ""
-
 #: airtime_mvc/application/views/scripts/webstream/webstream.phtml:30
 msgid "Stream URL:"
 msgstr ""
diff --git a/airtime_mvc/locale/nl_NL/LC_MESSAGES/airtime.po b/airtime_mvc/locale/nl_NL/LC_MESSAGES/airtime.po
index 55fb61bcc..18fe6f248 100644
--- a/airtime_mvc/locale/nl_NL/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/nl_NL/LC_MESSAGES/airtime.po
@@ -706,26 +706,6 @@ msgstr "Geschiedenis sjablonen"
 msgid "Listener Stats"
 msgstr "luister status"
 
-#: airtime_mvc/application/configs/navigation.php:144
-msgid "Upgrade"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:144
-msgid "Billing"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:151
-msgid "Account Plans"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:158
-msgid "Account Details"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:165
-msgid "View Invoices"
-msgstr ""
-
 #: airtime_mvc/application/configs/navigation.php:175
 #: airtime_mvc/application/views/scripts/error/error-400.phtml:13
 #: airtime_mvc/application/views/scripts/error/error-403.phtml:13
@@ -2879,50 +2859,6 @@ msgstr "Gebruiker Type :"
 msgid "Login name is not unique."
 msgstr "Login naam is niet uniek."
 
-#: airtime_mvc/application/forms/BillingClient.php:125
-msgid "What is the name of your favorite childhood friend?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:126
-msgid "What school did you attend for sixth grade?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:127
-msgid "In what city did you meet your spouse/significant other?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:128
-msgid "What street did you live on in third grade?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:129
-msgid "What is the first name of the boy or girl that you first kissed?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:130
-msgid "In what city or town was your first job?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:19
-msgid "Plan type:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:31
-msgid "Billing cycle:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:39
-msgid "Payment method:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:42
-msgid "PayPal"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:43
-msgid "Credit Card via 2Checkout"
-msgstr ""
-
 #: airtime_mvc/application/forms/customvalidators/ConditionalNotEmpty.php:32
 #: airtime_mvc/application/forms/helpers/ValidationTypes.php:8
 msgid "Value is required and can't be empty"
@@ -4329,11 +4265,6 @@ msgstr "Kies show exemplaar"
 msgid "Find"
 msgstr "Zoeken"
 
-#: airtime_mvc/application/views/scripts/form/edit-user.phtml:7
-#, php-format
-msgid "<b>Note:</b> Since you're the station owner, your account information can be edited in <a href=\"%s\">Billing Settings</a> instead."
-msgstr ""
-
 #: airtime_mvc/application/views/scripts/form/login.phtml:41
 msgid "Forgot your password?"
 msgstr ""
@@ -5078,11 +5009,6 @@ msgstr "Achternaam"
 msgid "User Type"
 msgstr "Gebruikerstype"
 
-#: airtime_mvc/application/views/scripts/user/add-user.phtml:31
-#, php-format
-msgid "Super Admin details can be changed in your <a href=\"%s\">Billing Settings</a>."
-msgstr ""
-
 #: airtime_mvc/application/views/scripts/webstream/webstream.phtml:30
 msgid "Stream URL:"
 msgstr "Stream URL:"
diff --git a/airtime_mvc/locale/nl_NL/LC_MESSAGES/pro.po b/airtime_mvc/locale/nl_NL/LC_MESSAGES/pro.po
deleted file mode 100644
index 2cb427894..000000000
--- a/airtime_mvc/locale/nl_NL/LC_MESSAGES/pro.po
+++ /dev/null
@@ -1,143 +0,0 @@
-#: airtime_mvc/application/controllers/LoginController.php:188
-#, php-format
-msgid "That username or email address could not be found. If you are the station owner, you should <a href=\"%s\">reset your here</a>."
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:16
-msgid "First Name:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:25
-msgid "Last Name:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:34
-msgid "Company Name:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:43
-msgid "Email Address:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:53
-msgid "Address 1:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:62
-msgid "Address 2:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:69
-msgid "City:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:79
-msgid "State/Region:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:88
-msgid "Zip Code / Postal Code:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:101
-msgid "Country:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:111
-msgid "Phone Number:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:120
-msgid "Please choose a security question:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:134
-msgid "Please enter an answer:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:151
-msgid "VAT/Tax ID (EU only)"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:161
-msgid "Subscribe to Sourcefabric newsletter"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:171
-msgid "Password:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:180
-msgid "Verify Password:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:196
-msgid "Save"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/invoices.phtml:7
-msgid "<b>Thank you!</b> Your plan has been updated and you will be invoiced during your next billing cycle."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/invoices.phtml:11
-msgid "Tip: To pay an invoice, click \"View Invoice\" and look for the \"Checkout\" button."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:177
-msgid "Account Plans"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:178
-msgid "Upgrade today to get more listeners and storage space!"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:182
-msgid "Monthly Plans"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:316
-msgid "View Plans"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:318
-msgid "Your Current Plan:"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:332
-msgid "Choose a plan: "
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:358
-msgid "Please enter your payment details:"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/form/password-restore.phtml:5
-#, php-format
-msgid "If you are the primary owner of this station, <a href=\"%s\">please reset your password here</a>."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
-#, php-format
-msgid "Purchase an %s plan!"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
-msgid "My Account"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/plupload/index.phtml:9
-#, php-format
-msgid "Disk quota exceeded. You cannot upload files until you %s upgrade your storage"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/thank-you/index.phtml:16
-msgid "Thank you!"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/thank-you/index.phtml:17
-msgid "Your station has been upgraded successfully."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/thank-you/index.phtml:18
-msgid "Return to Airtime"
-msgstr ""
diff --git a/airtime_mvc/locale/pl_PL/LC_MESSAGES/airtime.po b/airtime_mvc/locale/pl_PL/LC_MESSAGES/airtime.po
index 5b469dc6f..3e312303e 100644
--- a/airtime_mvc/locale/pl_PL/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/pl_PL/LC_MESSAGES/airtime.po
@@ -703,26 +703,6 @@ msgstr ""
 msgid "Listener Stats"
 msgstr "Statystyki słuchaczy"
 
-#: airtime_mvc/application/configs/navigation.php:144
-msgid "Upgrade"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:144
-msgid "Billing"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:151
-msgid "Account Plans"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:158
-msgid "Account Details"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:165
-msgid "View Invoices"
-msgstr ""
-
 #: airtime_mvc/application/configs/navigation.php:175
 #: airtime_mvc/application/views/scripts/error/error-400.phtml:13
 #: airtime_mvc/application/views/scripts/error/error-403.phtml:13
@@ -2876,50 +2856,6 @@ msgstr "Typ użytkownika:"
 msgid "Login name is not unique."
 msgstr "Nazwa użytkownika musi być unikalna."
 
-#: airtime_mvc/application/forms/BillingClient.php:125
-msgid "What is the name of your favorite childhood friend?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:126
-msgid "What school did you attend for sixth grade?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:127
-msgid "In what city did you meet your spouse/significant other?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:128
-msgid "What street did you live on in third grade?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:129
-msgid "What is the first name of the boy or girl that you first kissed?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:130
-msgid "In what city or town was your first job?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:19
-msgid "Plan type:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:31
-msgid "Billing cycle:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:39
-msgid "Payment method:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:42
-msgid "PayPal"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:43
-msgid "Credit Card via 2Checkout"
-msgstr ""
-
 #: airtime_mvc/application/forms/customvalidators/ConditionalNotEmpty.php:32
 #: airtime_mvc/application/forms/helpers/ValidationTypes.php:8
 msgid "Value is required and can't be empty"
@@ -4326,11 +4262,6 @@ msgstr ""
 msgid "Find"
 msgstr ""
 
-#: airtime_mvc/application/views/scripts/form/edit-user.phtml:7
-#, php-format
-msgid "<b>Note:</b> Since you're the station owner, your account information can be edited in <a href=\"%s\">Billing Settings</a> instead."
-msgstr ""
-
 #: airtime_mvc/application/views/scripts/form/login.phtml:41
 msgid "Forgot your password?"
 msgstr ""
@@ -5075,11 +5006,6 @@ msgstr "Nazwisko"
 msgid "User Type"
 msgstr "Typ użytkownika"
 
-#: airtime_mvc/application/views/scripts/user/add-user.phtml:31
-#, php-format
-msgid "Super Admin details can be changed in your <a href=\"%s\">Billing Settings</a>."
-msgstr ""
-
 #: airtime_mvc/application/views/scripts/webstream/webstream.phtml:30
 msgid "Stream URL:"
 msgstr "URL strumienia:"
diff --git a/airtime_mvc/locale/pl_PL/LC_MESSAGES/pro.po b/airtime_mvc/locale/pl_PL/LC_MESSAGES/pro.po
deleted file mode 100644
index 2cb427894..000000000
--- a/airtime_mvc/locale/pl_PL/LC_MESSAGES/pro.po
+++ /dev/null
@@ -1,143 +0,0 @@
-#: airtime_mvc/application/controllers/LoginController.php:188
-#, php-format
-msgid "That username or email address could not be found. If you are the station owner, you should <a href=\"%s\">reset your here</a>."
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:16
-msgid "First Name:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:25
-msgid "Last Name:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:34
-msgid "Company Name:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:43
-msgid "Email Address:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:53
-msgid "Address 1:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:62
-msgid "Address 2:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:69
-msgid "City:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:79
-msgid "State/Region:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:88
-msgid "Zip Code / Postal Code:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:101
-msgid "Country:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:111
-msgid "Phone Number:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:120
-msgid "Please choose a security question:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:134
-msgid "Please enter an answer:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:151
-msgid "VAT/Tax ID (EU only)"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:161
-msgid "Subscribe to Sourcefabric newsletter"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:171
-msgid "Password:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:180
-msgid "Verify Password:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:196
-msgid "Save"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/invoices.phtml:7
-msgid "<b>Thank you!</b> Your plan has been updated and you will be invoiced during your next billing cycle."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/invoices.phtml:11
-msgid "Tip: To pay an invoice, click \"View Invoice\" and look for the \"Checkout\" button."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:177
-msgid "Account Plans"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:178
-msgid "Upgrade today to get more listeners and storage space!"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:182
-msgid "Monthly Plans"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:316
-msgid "View Plans"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:318
-msgid "Your Current Plan:"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:332
-msgid "Choose a plan: "
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:358
-msgid "Please enter your payment details:"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/form/password-restore.phtml:5
-#, php-format
-msgid "If you are the primary owner of this station, <a href=\"%s\">please reset your password here</a>."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
-#, php-format
-msgid "Purchase an %s plan!"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
-msgid "My Account"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/plupload/index.phtml:9
-#, php-format
-msgid "Disk quota exceeded. You cannot upload files until you %s upgrade your storage"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/thank-you/index.phtml:16
-msgid "Thank you!"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/thank-you/index.phtml:17
-msgid "Your station has been upgraded successfully."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/thank-you/index.phtml:18
-msgid "Return to Airtime"
-msgstr ""
diff --git a/airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.po b/airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.po
index 2e3b9f946..c89c104bb 100644
--- a/airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/pt_BR/LC_MESSAGES/airtime.po
@@ -704,26 +704,6 @@ msgstr ""
 msgid "Listener Stats"
 msgstr "Estatísticas de Ouvintes"
 
-#: airtime_mvc/application/configs/navigation.php:144
-msgid "Upgrade"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:144
-msgid "Billing"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:151
-msgid "Account Plans"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:158
-msgid "Account Details"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:165
-msgid "View Invoices"
-msgstr ""
-
 #: airtime_mvc/application/configs/navigation.php:175
 #: airtime_mvc/application/views/scripts/error/error-400.phtml:13
 #: airtime_mvc/application/views/scripts/error/error-403.phtml:13
@@ -2877,50 +2857,6 @@ msgstr "Perfil do Usuário:"
 msgid "Login name is not unique."
 msgstr "Usuário já existe."
 
-#: airtime_mvc/application/forms/BillingClient.php:125
-msgid "What is the name of your favorite childhood friend?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:126
-msgid "What school did you attend for sixth grade?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:127
-msgid "In what city did you meet your spouse/significant other?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:128
-msgid "What street did you live on in third grade?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:129
-msgid "What is the first name of the boy or girl that you first kissed?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:130
-msgid "In what city or town was your first job?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:19
-msgid "Plan type:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:31
-msgid "Billing cycle:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:39
-msgid "Payment method:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:42
-msgid "PayPal"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:43
-msgid "Credit Card via 2Checkout"
-msgstr ""
-
 #: airtime_mvc/application/forms/customvalidators/ConditionalNotEmpty.php:32
 #: airtime_mvc/application/forms/helpers/ValidationTypes.php:8
 msgid "Value is required and can't be empty"
@@ -4327,11 +4263,6 @@ msgstr ""
 msgid "Find"
 msgstr ""
 
-#: airtime_mvc/application/views/scripts/form/edit-user.phtml:7
-#, php-format
-msgid "<b>Note:</b> Since you're the station owner, your account information can be edited in <a href=\"%s\">Billing Settings</a> instead."
-msgstr ""
-
 #: airtime_mvc/application/views/scripts/form/login.phtml:41
 msgid "Forgot your password?"
 msgstr ""
@@ -5076,11 +5007,6 @@ msgstr "Último Nome"
 msgid "User Type"
 msgstr "Tipo de Usuário"
 
-#: airtime_mvc/application/views/scripts/user/add-user.phtml:31
-#, php-format
-msgid "Super Admin details can be changed in your <a href=\"%s\">Billing Settings</a>."
-msgstr ""
-
 #: airtime_mvc/application/views/scripts/webstream/webstream.phtml:30
 msgid "Stream URL:"
 msgstr "URL do Fluxo:"
diff --git a/airtime_mvc/locale/pt_BR/LC_MESSAGES/pro.po b/airtime_mvc/locale/pt_BR/LC_MESSAGES/pro.po
deleted file mode 100644
index 2cb427894..000000000
--- a/airtime_mvc/locale/pt_BR/LC_MESSAGES/pro.po
+++ /dev/null
@@ -1,143 +0,0 @@
-#: airtime_mvc/application/controllers/LoginController.php:188
-#, php-format
-msgid "That username or email address could not be found. If you are the station owner, you should <a href=\"%s\">reset your here</a>."
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:16
-msgid "First Name:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:25
-msgid "Last Name:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:34
-msgid "Company Name:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:43
-msgid "Email Address:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:53
-msgid "Address 1:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:62
-msgid "Address 2:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:69
-msgid "City:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:79
-msgid "State/Region:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:88
-msgid "Zip Code / Postal Code:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:101
-msgid "Country:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:111
-msgid "Phone Number:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:120
-msgid "Please choose a security question:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:134
-msgid "Please enter an answer:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:151
-msgid "VAT/Tax ID (EU only)"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:161
-msgid "Subscribe to Sourcefabric newsletter"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:171
-msgid "Password:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:180
-msgid "Verify Password:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:196
-msgid "Save"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/invoices.phtml:7
-msgid "<b>Thank you!</b> Your plan has been updated and you will be invoiced during your next billing cycle."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/invoices.phtml:11
-msgid "Tip: To pay an invoice, click \"View Invoice\" and look for the \"Checkout\" button."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:177
-msgid "Account Plans"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:178
-msgid "Upgrade today to get more listeners and storage space!"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:182
-msgid "Monthly Plans"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:316
-msgid "View Plans"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:318
-msgid "Your Current Plan:"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:332
-msgid "Choose a plan: "
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:358
-msgid "Please enter your payment details:"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/form/password-restore.phtml:5
-#, php-format
-msgid "If you are the primary owner of this station, <a href=\"%s\">please reset your password here</a>."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
-#, php-format
-msgid "Purchase an %s plan!"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
-msgid "My Account"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/plupload/index.phtml:9
-#, php-format
-msgid "Disk quota exceeded. You cannot upload files until you %s upgrade your storage"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/thank-you/index.phtml:16
-msgid "Thank you!"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/thank-you/index.phtml:17
-msgid "Your station has been upgraded successfully."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/thank-you/index.phtml:18
-msgid "Return to Airtime"
-msgstr ""
diff --git a/airtime_mvc/locale/ro_RO/LC_MESSAGES/airtime.po b/airtime_mvc/locale/ro_RO/LC_MESSAGES/airtime.po
index a4460f441..425636bfc 100644
--- a/airtime_mvc/locale/ro_RO/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/ro_RO/LC_MESSAGES/airtime.po
@@ -701,26 +701,6 @@ msgstr ""
 msgid "Listener Stats"
 msgstr ""
 
-#: airtime_mvc/application/configs/navigation.php:144
-msgid "Upgrade"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:144
-msgid "Billing"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:151
-msgid "Account Plans"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:158
-msgid "Account Details"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:165
-msgid "View Invoices"
-msgstr ""
-
 #: airtime_mvc/application/configs/navigation.php:175
 #: airtime_mvc/application/views/scripts/error/error-400.phtml:13
 #: airtime_mvc/application/views/scripts/error/error-403.phtml:13
@@ -2872,50 +2852,6 @@ msgstr ""
 msgid "Login name is not unique."
 msgstr ""
 
-#: airtime_mvc/application/forms/BillingClient.php:125
-msgid "What is the name of your favorite childhood friend?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:126
-msgid "What school did you attend for sixth grade?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:127
-msgid "In what city did you meet your spouse/significant other?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:128
-msgid "What street did you live on in third grade?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:129
-msgid "What is the first name of the boy or girl that you first kissed?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:130
-msgid "In what city or town was your first job?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:19
-msgid "Plan type:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:31
-msgid "Billing cycle:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:39
-msgid "Payment method:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:42
-msgid "PayPal"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:43
-msgid "Credit Card via 2Checkout"
-msgstr ""
-
 #: airtime_mvc/application/forms/customvalidators/ConditionalNotEmpty.php:32
 #: airtime_mvc/application/forms/helpers/ValidationTypes.php:8
 msgid "Value is required and can't be empty"
@@ -4320,11 +4256,6 @@ msgstr ""
 msgid "Find"
 msgstr ""
 
-#: airtime_mvc/application/views/scripts/form/edit-user.phtml:7
-#, php-format
-msgid "<b>Note:</b> Since you're the station owner, your account information can be edited in <a href=\"%s\">Billing Settings</a> instead."
-msgstr ""
-
 #: airtime_mvc/application/views/scripts/form/login.phtml:41
 msgid "Forgot your password?"
 msgstr ""
@@ -5069,11 +5000,6 @@ msgstr ""
 msgid "User Type"
 msgstr ""
 
-#: airtime_mvc/application/views/scripts/user/add-user.phtml:31
-#, php-format
-msgid "Super Admin details can be changed in your <a href=\"%s\">Billing Settings</a>."
-msgstr ""
-
 #: airtime_mvc/application/views/scripts/webstream/webstream.phtml:30
 msgid "Stream URL:"
 msgstr ""
diff --git a/airtime_mvc/locale/ru_RU/LC_MESSAGES/airtime.po b/airtime_mvc/locale/ru_RU/LC_MESSAGES/airtime.po
index 3238c5e9a..d3b0c8660 100644
--- a/airtime_mvc/locale/ru_RU/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/ru_RU/LC_MESSAGES/airtime.po
@@ -711,26 +711,6 @@ msgstr "Шаблоны истории"
 msgid "Listener Stats"
 msgstr "Статистика по слушателям"
 
-#: airtime_mvc/application/configs/navigation.php:144
-msgid "Upgrade"
-msgstr "Обновление"
-
-#: airtime_mvc/application/configs/navigation.php:144
-msgid "Billing"
-msgstr "Биллинг"
-
-#: airtime_mvc/application/configs/navigation.php:151
-msgid "Account Plans"
-msgstr "Тарифный план"
-
-#: airtime_mvc/application/configs/navigation.php:158
-msgid "Account Details"
-msgstr "Детали учетной записи"
-
-#: airtime_mvc/application/configs/navigation.php:165
-msgid "View Invoices"
-msgstr "Показать счета"
-
 #: airtime_mvc/application/configs/navigation.php:175
 #: airtime_mvc/application/views/scripts/error/error-400.phtml:13
 #: airtime_mvc/application/views/scripts/error/error-403.phtml:13
@@ -2892,50 +2872,6 @@ msgstr "Тип пользователя:"
 msgid "Login name is not unique."
 msgstr "Имя пользователя не является уникальным."
 
-#: airtime_mvc/application/forms/BillingClient.php:125
-msgid "What is the name of your favorite childhood friend?"
-msgstr "Как звали вашего лучшего друга детства?"
-
-#: airtime_mvc/application/forms/BillingClient.php:126
-msgid "What school did you attend for sixth grade?"
-msgstr "В какой школе вы учились в шестом классе?"
-
-#: airtime_mvc/application/forms/BillingClient.php:127
-msgid "In what city did you meet your spouse/significant other?"
-msgstr "В каком городе вы встретили своего супруга?"
-
-#: airtime_mvc/application/forms/BillingClient.php:128
-msgid "What street did you live on in third grade?"
-msgstr "На какой улице вы жили в третьем классе?"
-
-#: airtime_mvc/application/forms/BillingClient.php:129
-msgid "What is the first name of the boy or girl that you first kissed?"
-msgstr "Как звали вашу первую девушку (вашего первого парня), которую(ого) вы поцеловали?"
-
-#: airtime_mvc/application/forms/BillingClient.php:130
-msgid "In what city or town was your first job?"
-msgstr "В каком городе вы впервые устроились на работу?"
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:19
-msgid "Plan type:"
-msgstr "Тарифный план:"
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:31
-msgid "Billing cycle:"
-msgstr "Цикличность оплаты:"
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:39
-msgid "Payment method:"
-msgstr "Способ оплаты:"
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:42
-msgid "PayPal"
-msgstr "PayPal"
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:43
-msgid "Credit Card via 2Checkout"
-msgstr "Кредитная карта через 2Checkout"
-
 #: airtime_mvc/application/forms/customvalidators/ConditionalNotEmpty.php:32
 #: airtime_mvc/application/forms/helpers/ValidationTypes.php:8
 msgid "Value is required and can't be empty"
@@ -4364,11 +4300,6 @@ msgstr "Выберите программу"
 msgid "Find"
 msgstr "Найти"
 
-#: airtime_mvc/application/views/scripts/form/edit-user.phtml:7
-#, php-format
-msgid "<b>Note:</b> Since you're the station owner, your account information can be edited in <a href=\"%s\">Billing Settings</a> instead."
-msgstr "<b>Примечание:</b> Так как вы владелец радиостанции, информация о вашем аккаунте может быть отредактирована в <a href=\"%s\">Настройках оплаты</a> ."
-
 #: airtime_mvc/application/views/scripts/form/login.phtml:41
 msgid "Forgot your password?"
 msgstr "Забыли пароль?"
@@ -5117,11 +5048,6 @@ msgstr "Фамилия"
 msgid "User Type"
 msgstr "Тип пользователя"
 
-#: airtime_mvc/application/views/scripts/user/add-user.phtml:31
-#, php-format
-msgid "Super Admin details can be changed in your <a href=\"%s\">Billing Settings</a>."
-msgstr "Данные СуперПользователя могут быть изменены в  <a href=\"%s\">Billing Settings</a>."
-
 #: airtime_mvc/application/views/scripts/webstream/webstream.phtml:30
 msgid "Stream URL:"
 msgstr "URL потока:"
diff --git a/airtime_mvc/locale/ru_RU/LC_MESSAGES/pro.po b/airtime_mvc/locale/ru_RU/LC_MESSAGES/pro.po
deleted file mode 100644
index 2cb427894..000000000
--- a/airtime_mvc/locale/ru_RU/LC_MESSAGES/pro.po
+++ /dev/null
@@ -1,143 +0,0 @@
-#: airtime_mvc/application/controllers/LoginController.php:188
-#, php-format
-msgid "That username or email address could not be found. If you are the station owner, you should <a href=\"%s\">reset your here</a>."
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:16
-msgid "First Name:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:25
-msgid "Last Name:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:34
-msgid "Company Name:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:43
-msgid "Email Address:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:53
-msgid "Address 1:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:62
-msgid "Address 2:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:69
-msgid "City:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:79
-msgid "State/Region:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:88
-msgid "Zip Code / Postal Code:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:101
-msgid "Country:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:111
-msgid "Phone Number:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:120
-msgid "Please choose a security question:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:134
-msgid "Please enter an answer:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:151
-msgid "VAT/Tax ID (EU only)"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:161
-msgid "Subscribe to Sourcefabric newsletter"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:171
-msgid "Password:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:180
-msgid "Verify Password:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:196
-msgid "Save"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/invoices.phtml:7
-msgid "<b>Thank you!</b> Your plan has been updated and you will be invoiced during your next billing cycle."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/invoices.phtml:11
-msgid "Tip: To pay an invoice, click \"View Invoice\" and look for the \"Checkout\" button."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:177
-msgid "Account Plans"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:178
-msgid "Upgrade today to get more listeners and storage space!"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:182
-msgid "Monthly Plans"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:316
-msgid "View Plans"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:318
-msgid "Your Current Plan:"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:332
-msgid "Choose a plan: "
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:358
-msgid "Please enter your payment details:"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/form/password-restore.phtml:5
-#, php-format
-msgid "If you are the primary owner of this station, <a href=\"%s\">please reset your password here</a>."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
-#, php-format
-msgid "Purchase an %s plan!"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
-msgid "My Account"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/plupload/index.phtml:9
-#, php-format
-msgid "Disk quota exceeded. You cannot upload files until you %s upgrade your storage"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/thank-you/index.phtml:16
-msgid "Thank you!"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/thank-you/index.phtml:17
-msgid "Your station has been upgraded successfully."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/thank-you/index.phtml:18
-msgid "Return to Airtime"
-msgstr ""
diff --git a/airtime_mvc/locale/si/LC_MESSAGES/airtime.po b/airtime_mvc/locale/si/LC_MESSAGES/airtime.po
index f17760c4a..ec24d872c 100644
--- a/airtime_mvc/locale/si/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/si/LC_MESSAGES/airtime.po
@@ -701,26 +701,6 @@ msgstr ""
 msgid "Listener Stats"
 msgstr ""
 
-#: airtime_mvc/application/configs/navigation.php:144
-msgid "Upgrade"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:144
-msgid "Billing"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:151
-msgid "Account Plans"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:158
-msgid "Account Details"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:165
-msgid "View Invoices"
-msgstr ""
-
 #: airtime_mvc/application/configs/navigation.php:175
 #: airtime_mvc/application/views/scripts/error/error-400.phtml:13
 #: airtime_mvc/application/views/scripts/error/error-403.phtml:13
@@ -2872,50 +2852,6 @@ msgstr ""
 msgid "Login name is not unique."
 msgstr ""
 
-#: airtime_mvc/application/forms/BillingClient.php:125
-msgid "What is the name of your favorite childhood friend?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:126
-msgid "What school did you attend for sixth grade?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:127
-msgid "In what city did you meet your spouse/significant other?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:128
-msgid "What street did you live on in third grade?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:129
-msgid "What is the first name of the boy or girl that you first kissed?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:130
-msgid "In what city or town was your first job?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:19
-msgid "Plan type:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:31
-msgid "Billing cycle:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:39
-msgid "Payment method:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:42
-msgid "PayPal"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:43
-msgid "Credit Card via 2Checkout"
-msgstr ""
-
 #: airtime_mvc/application/forms/customvalidators/ConditionalNotEmpty.php:32
 #: airtime_mvc/application/forms/helpers/ValidationTypes.php:8
 msgid "Value is required and can't be empty"
@@ -4320,11 +4256,6 @@ msgstr ""
 msgid "Find"
 msgstr ""
 
-#: airtime_mvc/application/views/scripts/form/edit-user.phtml:7
-#, php-format
-msgid "<b>Note:</b> Since you're the station owner, your account information can be edited in <a href=\"%s\">Billing Settings</a> instead."
-msgstr ""
-
 #: airtime_mvc/application/views/scripts/form/login.phtml:41
 msgid "Forgot your password?"
 msgstr ""
@@ -5069,11 +5000,6 @@ msgstr ""
 msgid "User Type"
 msgstr ""
 
-#: airtime_mvc/application/views/scripts/user/add-user.phtml:31
-#, php-format
-msgid "Super Admin details can be changed in your <a href=\"%s\">Billing Settings</a>."
-msgstr ""
-
 #: airtime_mvc/application/views/scripts/webstream/webstream.phtml:30
 msgid "Stream URL:"
 msgstr ""
diff --git a/airtime_mvc/locale/si/LC_MESSAGES/pro.po b/airtime_mvc/locale/si/LC_MESSAGES/pro.po
deleted file mode 100644
index 2cb427894..000000000
--- a/airtime_mvc/locale/si/LC_MESSAGES/pro.po
+++ /dev/null
@@ -1,143 +0,0 @@
-#: airtime_mvc/application/controllers/LoginController.php:188
-#, php-format
-msgid "That username or email address could not be found. If you are the station owner, you should <a href=\"%s\">reset your here</a>."
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:16
-msgid "First Name:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:25
-msgid "Last Name:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:34
-msgid "Company Name:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:43
-msgid "Email Address:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:53
-msgid "Address 1:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:62
-msgid "Address 2:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:69
-msgid "City:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:79
-msgid "State/Region:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:88
-msgid "Zip Code / Postal Code:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:101
-msgid "Country:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:111
-msgid "Phone Number:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:120
-msgid "Please choose a security question:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:134
-msgid "Please enter an answer:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:151
-msgid "VAT/Tax ID (EU only)"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:161
-msgid "Subscribe to Sourcefabric newsletter"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:171
-msgid "Password:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:180
-msgid "Verify Password:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:196
-msgid "Save"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/invoices.phtml:7
-msgid "<b>Thank you!</b> Your plan has been updated and you will be invoiced during your next billing cycle."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/invoices.phtml:11
-msgid "Tip: To pay an invoice, click \"View Invoice\" and look for the \"Checkout\" button."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:177
-msgid "Account Plans"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:178
-msgid "Upgrade today to get more listeners and storage space!"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:182
-msgid "Monthly Plans"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:316
-msgid "View Plans"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:318
-msgid "Your Current Plan:"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:332
-msgid "Choose a plan: "
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:358
-msgid "Please enter your payment details:"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/form/password-restore.phtml:5
-#, php-format
-msgid "If you are the primary owner of this station, <a href=\"%s\">please reset your password here</a>."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
-#, php-format
-msgid "Purchase an %s plan!"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
-msgid "My Account"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/plupload/index.phtml:9
-#, php-format
-msgid "Disk quota exceeded. You cannot upload files until you %s upgrade your storage"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/thank-you/index.phtml:16
-msgid "Thank you!"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/thank-you/index.phtml:17
-msgid "Your station has been upgraded successfully."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/thank-you/index.phtml:18
-msgid "Return to Airtime"
-msgstr ""
diff --git a/airtime_mvc/locale/sr_RS/LC_MESSAGES/airtime.po b/airtime_mvc/locale/sr_RS/LC_MESSAGES/airtime.po
index 6ead9c7d6..96f15dd05 100644
--- a/airtime_mvc/locale/sr_RS/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/sr_RS/LC_MESSAGES/airtime.po
@@ -702,26 +702,6 @@ msgstr "Историјски Шаблони"
 msgid "Listener Stats"
 msgstr "Слушатељска Статистика"
 
-#: airtime_mvc/application/configs/navigation.php:144
-msgid "Upgrade"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:144
-msgid "Billing"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:151
-msgid "Account Plans"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:158
-msgid "Account Details"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:165
-msgid "View Invoices"
-msgstr ""
-
 #: airtime_mvc/application/configs/navigation.php:175
 #: airtime_mvc/application/views/scripts/error/error-400.phtml:13
 #: airtime_mvc/application/views/scripts/error/error-403.phtml:13
@@ -2875,50 +2855,6 @@ msgstr "Типова Корисника:"
 msgid "Login name is not unique."
 msgstr "Име пријаве није јединствено."
 
-#: airtime_mvc/application/forms/BillingClient.php:125
-msgid "What is the name of your favorite childhood friend?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:126
-msgid "What school did you attend for sixth grade?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:127
-msgid "In what city did you meet your spouse/significant other?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:128
-msgid "What street did you live on in third grade?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:129
-msgid "What is the first name of the boy or girl that you first kissed?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:130
-msgid "In what city or town was your first job?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:19
-msgid "Plan type:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:31
-msgid "Billing cycle:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:39
-msgid "Payment method:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:42
-msgid "PayPal"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:43
-msgid "Credit Card via 2Checkout"
-msgstr ""
-
 #: airtime_mvc/application/forms/customvalidators/ConditionalNotEmpty.php:32
 #: airtime_mvc/application/forms/helpers/ValidationTypes.php:8
 msgid "Value is required and can't be empty"
@@ -4325,11 +4261,6 @@ msgstr "Одабери Емисијску Степену"
 msgid "Find"
 msgstr "Пронађи"
 
-#: airtime_mvc/application/views/scripts/form/edit-user.phtml:7
-#, php-format
-msgid "<b>Note:</b> Since you're the station owner, your account information can be edited in <a href=\"%s\">Billing Settings</a> instead."
-msgstr ""
-
 #: airtime_mvc/application/views/scripts/form/login.phtml:41
 msgid "Forgot your password?"
 msgstr ""
@@ -5074,11 +5005,6 @@ msgstr "Презиме"
 msgid "User Type"
 msgstr "Врста Корисника"
 
-#: airtime_mvc/application/views/scripts/user/add-user.phtml:31
-#, php-format
-msgid "Super Admin details can be changed in your <a href=\"%s\">Billing Settings</a>."
-msgstr ""
-
 #: airtime_mvc/application/views/scripts/webstream/webstream.phtml:30
 msgid "Stream URL:"
 msgstr "URL Преноса:"
diff --git a/airtime_mvc/locale/sr_RS/LC_MESSAGES/pro.po b/airtime_mvc/locale/sr_RS/LC_MESSAGES/pro.po
deleted file mode 100644
index 2cb427894..000000000
--- a/airtime_mvc/locale/sr_RS/LC_MESSAGES/pro.po
+++ /dev/null
@@ -1,143 +0,0 @@
-#: airtime_mvc/application/controllers/LoginController.php:188
-#, php-format
-msgid "That username or email address could not be found. If you are the station owner, you should <a href=\"%s\">reset your here</a>."
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:16
-msgid "First Name:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:25
-msgid "Last Name:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:34
-msgid "Company Name:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:43
-msgid "Email Address:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:53
-msgid "Address 1:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:62
-msgid "Address 2:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:69
-msgid "City:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:79
-msgid "State/Region:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:88
-msgid "Zip Code / Postal Code:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:101
-msgid "Country:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:111
-msgid "Phone Number:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:120
-msgid "Please choose a security question:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:134
-msgid "Please enter an answer:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:151
-msgid "VAT/Tax ID (EU only)"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:161
-msgid "Subscribe to Sourcefabric newsletter"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:171
-msgid "Password:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:180
-msgid "Verify Password:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:196
-msgid "Save"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/invoices.phtml:7
-msgid "<b>Thank you!</b> Your plan has been updated and you will be invoiced during your next billing cycle."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/invoices.phtml:11
-msgid "Tip: To pay an invoice, click \"View Invoice\" and look for the \"Checkout\" button."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:177
-msgid "Account Plans"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:178
-msgid "Upgrade today to get more listeners and storage space!"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:182
-msgid "Monthly Plans"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:316
-msgid "View Plans"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:318
-msgid "Your Current Plan:"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:332
-msgid "Choose a plan: "
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:358
-msgid "Please enter your payment details:"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/form/password-restore.phtml:5
-#, php-format
-msgid "If you are the primary owner of this station, <a href=\"%s\">please reset your password here</a>."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
-#, php-format
-msgid "Purchase an %s plan!"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
-msgid "My Account"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/plupload/index.phtml:9
-#, php-format
-msgid "Disk quota exceeded. You cannot upload files until you %s upgrade your storage"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/thank-you/index.phtml:16
-msgid "Thank you!"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/thank-you/index.phtml:17
-msgid "Your station has been upgraded successfully."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/thank-you/index.phtml:18
-msgid "Return to Airtime"
-msgstr ""
diff --git a/airtime_mvc/locale/sr_RS@latin/LC_MESSAGES/airtime.po b/airtime_mvc/locale/sr_RS@latin/LC_MESSAGES/airtime.po
index 1b169a035..dd60aed01 100644
--- a/airtime_mvc/locale/sr_RS@latin/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/sr_RS@latin/LC_MESSAGES/airtime.po
@@ -702,26 +702,6 @@ msgstr "Istorijski Šabloni"
 msgid "Listener Stats"
 msgstr "Slušateljska Statistika"
 
-#: airtime_mvc/application/configs/navigation.php:144
-msgid "Upgrade"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:144
-msgid "Billing"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:151
-msgid "Account Plans"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:158
-msgid "Account Details"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:165
-msgid "View Invoices"
-msgstr ""
-
 #: airtime_mvc/application/configs/navigation.php:175
 #: airtime_mvc/application/views/scripts/error/error-400.phtml:13
 #: airtime_mvc/application/views/scripts/error/error-403.phtml:13
@@ -2875,50 +2855,6 @@ msgstr "Tipova Korisnika:"
 msgid "Login name is not unique."
 msgstr "Ime prijave nije jedinstveno."
 
-#: airtime_mvc/application/forms/BillingClient.php:125
-msgid "What is the name of your favorite childhood friend?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:126
-msgid "What school did you attend for sixth grade?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:127
-msgid "In what city did you meet your spouse/significant other?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:128
-msgid "What street did you live on in third grade?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:129
-msgid "What is the first name of the boy or girl that you first kissed?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:130
-msgid "In what city or town was your first job?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:19
-msgid "Plan type:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:31
-msgid "Billing cycle:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:39
-msgid "Payment method:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:42
-msgid "PayPal"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:43
-msgid "Credit Card via 2Checkout"
-msgstr ""
-
 #: airtime_mvc/application/forms/customvalidators/ConditionalNotEmpty.php:32
 #: airtime_mvc/application/forms/helpers/ValidationTypes.php:8
 msgid "Value is required and can't be empty"
@@ -4325,11 +4261,6 @@ msgstr "Odaberi Emisijsku Stepenu"
 msgid "Find"
 msgstr "Pronađi"
 
-#: airtime_mvc/application/views/scripts/form/edit-user.phtml:7
-#, php-format
-msgid "<b>Note:</b> Since you're the station owner, your account information can be edited in <a href=\"%s\">Billing Settings</a> instead."
-msgstr ""
-
 #: airtime_mvc/application/views/scripts/form/login.phtml:41
 msgid "Forgot your password?"
 msgstr ""
@@ -5074,11 +5005,6 @@ msgstr "Prezime"
 msgid "User Type"
 msgstr "Vrsta Korisnika"
 
-#: airtime_mvc/application/views/scripts/user/add-user.phtml:31
-#, php-format
-msgid "Super Admin details can be changed in your <a href=\"%s\">Billing Settings</a>."
-msgstr ""
-
 #: airtime_mvc/application/views/scripts/webstream/webstream.phtml:30
 msgid "Stream URL:"
 msgstr "URL Prenosa:"
diff --git a/airtime_mvc/locale/sr_RS@latin/LC_MESSAGES/pro.po b/airtime_mvc/locale/sr_RS@latin/LC_MESSAGES/pro.po
deleted file mode 100644
index 2cb427894..000000000
--- a/airtime_mvc/locale/sr_RS@latin/LC_MESSAGES/pro.po
+++ /dev/null
@@ -1,143 +0,0 @@
-#: airtime_mvc/application/controllers/LoginController.php:188
-#, php-format
-msgid "That username or email address could not be found. If you are the station owner, you should <a href=\"%s\">reset your here</a>."
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:16
-msgid "First Name:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:25
-msgid "Last Name:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:34
-msgid "Company Name:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:43
-msgid "Email Address:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:53
-msgid "Address 1:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:62
-msgid "Address 2:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:69
-msgid "City:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:79
-msgid "State/Region:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:88
-msgid "Zip Code / Postal Code:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:101
-msgid "Country:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:111
-msgid "Phone Number:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:120
-msgid "Please choose a security question:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:134
-msgid "Please enter an answer:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:151
-msgid "VAT/Tax ID (EU only)"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:161
-msgid "Subscribe to Sourcefabric newsletter"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:171
-msgid "Password:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:180
-msgid "Verify Password:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:196
-msgid "Save"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/invoices.phtml:7
-msgid "<b>Thank you!</b> Your plan has been updated and you will be invoiced during your next billing cycle."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/invoices.phtml:11
-msgid "Tip: To pay an invoice, click \"View Invoice\" and look for the \"Checkout\" button."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:177
-msgid "Account Plans"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:178
-msgid "Upgrade today to get more listeners and storage space!"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:182
-msgid "Monthly Plans"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:316
-msgid "View Plans"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:318
-msgid "Your Current Plan:"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:332
-msgid "Choose a plan: "
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:358
-msgid "Please enter your payment details:"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/form/password-restore.phtml:5
-#, php-format
-msgid "If you are the primary owner of this station, <a href=\"%s\">please reset your password here</a>."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
-#, php-format
-msgid "Purchase an %s plan!"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
-msgid "My Account"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/plupload/index.phtml:9
-#, php-format
-msgid "Disk quota exceeded. You cannot upload files until you %s upgrade your storage"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/thank-you/index.phtml:16
-msgid "Thank you!"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/thank-you/index.phtml:17
-msgid "Your station has been upgraded successfully."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/thank-you/index.phtml:18
-msgid "Return to Airtime"
-msgstr ""
diff --git a/airtime_mvc/locale/template/airtime.po b/airtime_mvc/locale/template/airtime.po
index 053f7549d..3a7e36623 100644
--- a/airtime_mvc/locale/template/airtime.po
+++ b/airtime_mvc/locale/template/airtime.po
@@ -701,26 +701,6 @@ msgstr ""
 msgid "Listener Stats"
 msgstr ""
 
-#: airtime_mvc/application/configs/navigation.php:144
-msgid "Upgrade"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:144
-msgid "Billing"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:151
-msgid "Account Plans"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:158
-msgid "Account Details"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:165
-msgid "View Invoices"
-msgstr ""
-
 #: airtime_mvc/application/configs/navigation.php:175
 #: airtime_mvc/application/views/scripts/error/error-400.phtml:13
 #: airtime_mvc/application/views/scripts/error/error-403.phtml:13
@@ -2603,7 +2583,6 @@ msgid "Password field cannot be empty."
 msgstr ""
 
 #: airtime_mvc/application/forms/AddShowRebroadcastDates.php:15
-#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:6
 msgid "days"
 msgstr ""
 
@@ -2872,50 +2851,6 @@ msgstr ""
 msgid "Login name is not unique."
 msgstr ""
 
-#: airtime_mvc/application/forms/BillingClient.php:125
-msgid "What is the name of your favorite childhood friend?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:126
-msgid "What school did you attend for sixth grade?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:127
-msgid "In what city did you meet your spouse/significant other?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:128
-msgid "What street did you live on in third grade?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:129
-msgid "What is the first name of the boy or girl that you first kissed?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:130
-msgid "In what city or town was your first job?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:19
-msgid "Plan type:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:31
-msgid "Billing cycle:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:39
-msgid "Payment method:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:42
-msgid "PayPal"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:43
-msgid "Credit Card via 2Checkout"
-msgstr ""
-
 #: airtime_mvc/application/forms/customvalidators/ConditionalNotEmpty.php:32
 #: airtime_mvc/application/forms/helpers/ValidationTypes.php:8
 msgid "Value is required and can't be empty"
@@ -4320,11 +4255,6 @@ msgstr ""
 msgid "Find"
 msgstr ""
 
-#: airtime_mvc/application/views/scripts/form/edit-user.phtml:7
-#, php-format
-msgid "<b>Note:</b> Since you're the station owner, your account information can be edited in <a href=\"%s\">Billing Settings</a> instead."
-msgstr ""
-
 #: airtime_mvc/application/views/scripts/form/login.phtml:41
 msgid "Forgot your password?"
 msgstr ""
@@ -4694,10 +4624,6 @@ msgstr ""
 msgid "Logout"
 msgstr ""
 
-#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:3
-msgid "Your trial expires in"
-msgstr ""
-
 #: airtime_mvc/application/views/scripts/playlist/playlist.phtml:40
 #: airtime_mvc/application/views/scripts/playlist/smart-block.phtml:46
 msgid "Toggle Details"
@@ -5069,11 +4995,6 @@ msgstr ""
 msgid "User Type"
 msgstr ""
 
-#: airtime_mvc/application/views/scripts/user/add-user.phtml:31
-#, php-format
-msgid "Super Admin details can be changed in your <a href=\"%s\">Billing Settings</a>."
-msgstr ""
-
 #: airtime_mvc/application/views/scripts/webstream/webstream.phtml:30
 msgid "Stream URL:"
 msgstr ""
diff --git a/airtime_mvc/locale/template/pro.po b/airtime_mvc/locale/template/pro.po
deleted file mode 100644
index cd01bd50f..000000000
--- a/airtime_mvc/locale/template/pro.po
+++ /dev/null
@@ -1,162 +0,0 @@
-# LANGUAGE (xx_XX) translation for Airtime.
-# Copyright (C) 2012 Sourcefabric
-# This file is distributed under the same license as the Airtime package.
-# Sourcefabric <contact@sourcefabric.org>, 2012.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: Airtime 2.5\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-03-21 18:06+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: airtime_mvc/application/controllers/LoginController.php:188
-#, php-format
-msgid "That username or email address could not be found. If you are the station owner, you should <a href=\"%s\">reset your here</a>."
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:16
-msgid "First Name:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:25
-msgid "Last Name:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:34
-msgid "Company Name:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:43
-msgid "Email Address:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:53
-msgid "Address 1:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:62
-msgid "Address 2:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:69
-msgid "City:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:79
-msgid "State/Region:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:88
-msgid "Zip Code / Postal Code:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:101
-msgid "Country:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:111
-msgid "Phone Number:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:120
-msgid "Please choose a security question:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:134
-msgid "Please enter an answer:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:151
-msgid "VAT/Tax ID (EU only)"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:161
-msgid "Subscribe to Sourcefabric newsletter"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:171
-msgid "Password:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:180
-msgid "Verify Password:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:196
-msgid "Save"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/invoices.phtml:7
-msgid "<b>Thank you!</b> Your plan has been updated and you will be invoiced during your next billing cycle."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/invoices.phtml:11
-msgid "Tip: To pay an invoice, click \"View Invoice\" and look for the \"Checkout\" button."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:177
-msgid "Account Plans"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:178
-msgid "Upgrade today to get more listeners and storage space!"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:182
-msgid "Monthly Plans"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:316
-msgid "View Plans"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:318
-msgid "Your Current Plan:"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:332
-msgid "Choose a plan: "
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:358
-msgid "Please enter your payment details:"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/form/password-restore.phtml:5
-#, php-format
-msgid "If you are the primary owner of this station, <a href=\"%s\">please reset your password here</a>."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
-#, php-format
-msgid "Purchase an %s plan!"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
-msgid "My Account"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/plupload/index.phtml:9
-#, php-format
-msgid "Disk quota exceeded. You cannot upload files until you %s upgrade your storage"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/thank-you/index.phtml:16
-msgid "Thank you!"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/thank-you/index.phtml:17
-msgid "Your station has been upgraded successfully."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/thank-you/index.phtml:18
-msgid "Return to Airtime"
-msgstr ""
diff --git a/airtime_mvc/locale/tr/LC_MESSAGES/airtime.po b/airtime_mvc/locale/tr/LC_MESSAGES/airtime.po
index dda42ddf1..46a07b377 100644
--- a/airtime_mvc/locale/tr/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/tr/LC_MESSAGES/airtime.po
@@ -702,26 +702,6 @@ msgstr ""
 msgid "Listener Stats"
 msgstr ""
 
-#: airtime_mvc/application/configs/navigation.php:144
-msgid "Upgrade"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:144
-msgid "Billing"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:151
-msgid "Account Plans"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:158
-msgid "Account Details"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:165
-msgid "View Invoices"
-msgstr ""
-
 #: airtime_mvc/application/configs/navigation.php:175
 #: airtime_mvc/application/views/scripts/error/error-400.phtml:13
 #: airtime_mvc/application/views/scripts/error/error-403.phtml:13
@@ -2873,50 +2853,6 @@ msgstr "Kullanıcı Tipi:"
 msgid "Login name is not unique."
 msgstr "Kullanıcı adı eşsiz değil."
 
-#: airtime_mvc/application/forms/BillingClient.php:125
-msgid "What is the name of your favorite childhood friend?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:126
-msgid "What school did you attend for sixth grade?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:127
-msgid "In what city did you meet your spouse/significant other?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:128
-msgid "What street did you live on in third grade?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:129
-msgid "What is the first name of the boy or girl that you first kissed?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:130
-msgid "In what city or town was your first job?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:19
-msgid "Plan type:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:31
-msgid "Billing cycle:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:39
-msgid "Payment method:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:42
-msgid "PayPal"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:43
-msgid "Credit Card via 2Checkout"
-msgstr ""
-
 #: airtime_mvc/application/forms/customvalidators/ConditionalNotEmpty.php:32
 #: airtime_mvc/application/forms/helpers/ValidationTypes.php:8
 msgid "Value is required and can't be empty"
@@ -4321,11 +4257,6 @@ msgstr ""
 msgid "Find"
 msgstr ""
 
-#: airtime_mvc/application/views/scripts/form/edit-user.phtml:7
-#, php-format
-msgid "<b>Note:</b> Since you're the station owner, your account information can be edited in <a href=\"%s\">Billing Settings</a> instead."
-msgstr ""
-
 #: airtime_mvc/application/views/scripts/form/login.phtml:41
 msgid "Forgot your password?"
 msgstr ""
@@ -5070,11 +5001,6 @@ msgstr "Soyisim"
 msgid "User Type"
 msgstr ""
 
-#: airtime_mvc/application/views/scripts/user/add-user.phtml:31
-#, php-format
-msgid "Super Admin details can be changed in your <a href=\"%s\">Billing Settings</a>."
-msgstr ""
-
 #: airtime_mvc/application/views/scripts/webstream/webstream.phtml:30
 msgid "Stream URL:"
 msgstr ""
diff --git a/airtime_mvc/locale/zh_CN/LC_MESSAGES/airtime.po b/airtime_mvc/locale/zh_CN/LC_MESSAGES/airtime.po
index eea0f5018..f50f41e83 100644
--- a/airtime_mvc/locale/zh_CN/LC_MESSAGES/airtime.po
+++ b/airtime_mvc/locale/zh_CN/LC_MESSAGES/airtime.po
@@ -702,26 +702,6 @@ msgstr "历史记录模板"
 msgid "Listener Stats"
 msgstr "收听状态"
 
-#: airtime_mvc/application/configs/navigation.php:144
-msgid "Upgrade"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:144
-msgid "Billing"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:151
-msgid "Account Plans"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:158
-msgid "Account Details"
-msgstr ""
-
-#: airtime_mvc/application/configs/navigation.php:165
-msgid "View Invoices"
-msgstr ""
-
 #: airtime_mvc/application/configs/navigation.php:175
 #: airtime_mvc/application/views/scripts/error/error-400.phtml:13
 #: airtime_mvc/application/views/scripts/error/error-403.phtml:13
@@ -2875,50 +2855,6 @@ msgstr "用户类型："
 msgid "Login name is not unique."
 msgstr "帐号重名。"
 
-#: airtime_mvc/application/forms/BillingClient.php:125
-msgid "What is the name of your favorite childhood friend?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:126
-msgid "What school did you attend for sixth grade?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:127
-msgid "In what city did you meet your spouse/significant other?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:128
-msgid "What street did you live on in third grade?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:129
-msgid "What is the first name of the boy or girl that you first kissed?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:130
-msgid "In what city or town was your first job?"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:19
-msgid "Plan type:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:31
-msgid "Billing cycle:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:39
-msgid "Payment method:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:42
-msgid "PayPal"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingUpgradeDowngrade.php:43
-msgid "Credit Card via 2Checkout"
-msgstr ""
-
 #: airtime_mvc/application/forms/customvalidators/ConditionalNotEmpty.php:32
 #: airtime_mvc/application/forms/helpers/ValidationTypes.php:8
 msgid "Value is required and can't be empty"
@@ -4325,11 +4261,6 @@ msgstr "选择节目项"
 msgid "Find"
 msgstr "查找"
 
-#: airtime_mvc/application/views/scripts/form/edit-user.phtml:7
-#, php-format
-msgid "<b>Note:</b> Since you're the station owner, your account information can be edited in <a href=\"%s\">Billing Settings</a> instead."
-msgstr ""
-
 #: airtime_mvc/application/views/scripts/form/login.phtml:41
 msgid "Forgot your password?"
 msgstr ""
@@ -5074,11 +5005,6 @@ msgstr "姓"
 msgid "User Type"
 msgstr "用户类型"
 
-#: airtime_mvc/application/views/scripts/user/add-user.phtml:31
-#, php-format
-msgid "Super Admin details can be changed in your <a href=\"%s\">Billing Settings</a>."
-msgstr ""
-
 #: airtime_mvc/application/views/scripts/webstream/webstream.phtml:30
 msgid "Stream URL:"
 msgstr "流的链接地址："
diff --git a/airtime_mvc/locale/zh_CN/LC_MESSAGES/pro.po b/airtime_mvc/locale/zh_CN/LC_MESSAGES/pro.po
deleted file mode 100644
index 2cb427894..000000000
--- a/airtime_mvc/locale/zh_CN/LC_MESSAGES/pro.po
+++ /dev/null
@@ -1,143 +0,0 @@
-#: airtime_mvc/application/controllers/LoginController.php:188
-#, php-format
-msgid "That username or email address could not be found. If you are the station owner, you should <a href=\"%s\">reset your here</a>."
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:16
-msgid "First Name:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:25
-msgid "Last Name:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:34
-msgid "Company Name:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:43
-msgid "Email Address:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:53
-msgid "Address 1:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:62
-msgid "Address 2:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:69
-msgid "City:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:79
-msgid "State/Region:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:88
-msgid "Zip Code / Postal Code:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:101
-msgid "Country:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:111
-msgid "Phone Number:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:120
-msgid "Please choose a security question:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:134
-msgid "Please enter an answer:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:151
-msgid "VAT/Tax ID (EU only)"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:161
-msgid "Subscribe to Sourcefabric newsletter"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:171
-msgid "Password:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:180
-msgid "Verify Password:"
-msgstr ""
-
-#: airtime_mvc/application/forms/BillingClient.php:196
-msgid "Save"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/invoices.phtml:7
-msgid "<b>Thank you!</b> Your plan has been updated and you will be invoiced during your next billing cycle."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/invoices.phtml:11
-msgid "Tip: To pay an invoice, click \"View Invoice\" and look for the \"Checkout\" button."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:177
-msgid "Account Plans"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:178
-msgid "Upgrade today to get more listeners and storage space!"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:182
-msgid "Monthly Plans"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:316
-msgid "View Plans"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:318
-msgid "Your Current Plan:"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:332
-msgid "Choose a plan: "
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/billing/upgrade.phtml:358
-msgid "Please enter your payment details:"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/form/password-restore.phtml:5
-#, php-format
-msgid "If you are the primary owner of this station, <a href=\"%s\">please reset your password here</a>."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
-#, php-format
-msgid "Purchase an %s plan!"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/partialviews/trialBox.phtml:9
-msgid "My Account"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/plupload/index.phtml:9
-#, php-format
-msgid "Disk quota exceeded. You cannot upload files until you %s upgrade your storage"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/thank-you/index.phtml:16
-msgid "Thank you!"
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/thank-you/index.phtml:17
-msgid "Your station has been upgraded successfully."
-msgstr ""
-
-#: airtime_mvc/application/views/scripts/thank-you/index.phtml:18
-msgid "Return to Airtime"
-msgstr ""
diff --git a/airtime_mvc/public/css/billing.css b/airtime_mvc/public/css/billing.css
deleted file mode 100644
index c3e20be92..000000000
--- a/airtime_mvc/public/css/billing.css
+++ /dev/null
@@ -1,316 +0,0 @@
-@CHARSET "UTF-8";
-
-.billing-panel
-{
-	width: 500px;
-	margin-bottom: 30px;
-}
-
-.billing-panel h3
-{
-	padding-left: 0px;
-}
-
-.billing-panel h4
-{
-    font-size: 1.25em;
-    margin: 0px;
-    /*color: #333;*/
-    font-weight: normal;
-}
-
-#upgrade-downgrade
-{
-	border: 0px solid #000;
-	margin: 0 auto;
-	/*color: #000;*/
-}
-
-#upgrade-downgrade label
-{
-	/*color: rgb(28,28,28);*/
-}
-#upgrade-downgrade label.disabled
-{
-	/*color: rgb(108,108,108);*/
-}
-
-#upgrade-downgrade dl
-{
-	width: 300px;
-}
-
-#upgrade-downgrade dt, #upgrade-downgrade dd
-{
-	margin: 0px;
-}
-
-#upgrade-downgrade dd
-{
-	margin-bottom: 10px;
-}
-
-.pricing-grid table
-{
-	border-spacing: 0px;
-    border-collapse: separate;
-	width: 680px;
-	/*border: 1px solid #777;*/
-	/*background-color: #555;*/
-	table-layout: fixed;
-	margin-top: 20px;
-	margin-bottom: 20px;
-	/*box-shadow: 0px 5px 5px rgba(0,0,0,0.5);*/
-	color: #000;
-}
-
-.pricing-grid td, .pricing-grid th
-{
-	border-bottom: 1px solid #5b5b5b;
-	border-right: 1px solid #5b5b5b;
-	padding: 10px;
-}
-
-.pricing-grid td {
-	background: #2f2f2f;
-	color: #cdcdcd;
-}
-
-.pricing-grid .last-column {
-	border-right: none;
-}
-
-.pricing-grid .last-row td {
-	border-bottom: none;
-}
-
-.pricing-grid th
-{
-    border: 0px;
-	color: #CDCDCD;
-	background-color:#5E5E5E;
-	background: #5E5E5E;
-	border-top: 1px solid #9d9d9d;
-	/*background: -moz-linear-gradient(top, #dd4202 0, #ff5d1a 100%);
-	background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #dd4202), color-stop(100%, #ff5d1a));*/
-}
-
-
-.pricing-grid tr.price td
-{
-	text-align: right;
-    background-color: #ddd;
-    font-weight: bold;
-	background-color: #2f2f2f;
-	color: #cdcdcd;
-}
-
-#plantype
-{
-	float: left;
-}
-
-#billingcycle
-{
-	float: left;
-	margin-left: 30px;
-}
-
-#billingcycle_disclaimer
-{
-    float: left;
-    margin-left: 30px;
-    width: 200px;
-}
-
-#vat_disclaimer
-{
-	text-align: right;
-	font-size: 0.9em;
-	margin-bottom: 30px;
-}
-
-#vat_disclaimer2
-{
-    float:right;
-    width: 200px;
-}
-
-#subtotal_box, #total_box
-{
-	position: relative;
-	text-align: right;
-	margin-top: 30px;
-	margin-bottom: 10px;
-	border: 1px solid #777;
-	background: #ccc;
-	padding: 5px;
-	color: #000;
-}
-#total_box
-{
-	margin-top: 10px;
-}
-
-#total
-{
-	border-bottom: 3px double;
-}
-
-#savings
-{
-	/*line-height: 30px;*/
-	position: absolute;
-	bottom: 5px;
-	left: 5px;
-}
-
-#paymentmethod
-{
-}
-
-.billing_col1, .billing_col2
-{
-	float: left;
-	margin-right: 10px;
-}
-
-.billing_checkbox
-{
-	float: left;
-	margin-right: 5px;
-    margin-bottom: 10px;
-}
-
-#upgrade-downgrade input[type=submit]
-{
-	float: right;
-}
-
-#invoices_table
-{
-    border-spacing: 0px;
-    border-collapse: separate;
-    border: 1px solid #777;
-    /*background-color: #555;*/
-    table-layout: fixed;
-    margin-top: 20px;
-    margin-bottom: 35px;
-	width: 500px;
-}
-
-#invoices_table tbody tr th
-{
-	border: 0px;
-	color: #efefef;
-	background: #5E5E5E;
-	background-color: #5E5E5E;
-	border-top: 1px solid #9d9d9d;
-
-}
-
-#invoices_table .header
-{
-    box-shadow: 0px 2px 2px rgba(0,0,0,0.5);
-}
-
-
-#invoices_table tr
-{
-    border: 1px solid #555;
-}
-
-#invoices_table .unpaid
-{
-	color: #ff0000;
-}
-
-.invoice-status-good {
-	background: #e3ffc9 url(images/stream_status.png) no-repeat 10px 10px;
-	border-color: #54b300;
-	padding: 2px 12px 4px 32px;
-	margin: 2px 1px 10px 0px;
-	color: #330;
-}
-
-/** This form is the separate one on the Billing Account Details page (BillingClient.php) */
-#clientdetails_form {
-	width: 500px;
-}
-
-#clientdetails_form dt {
-    float: left;
-    clear: both;
-    width: 50%;
-    /*margin-bottom: 10px;*/
-}
-#clientdetails_form dd {
-	float: left;
-	margin-left: 0px;
-	margin-bottom: 10px;
-}
-#clientdetails_form .right-align
-{
-	/*text-align: right;*/
-	width: 100%;
-}
-
-#promo-plan-eligible {
-	margin-top: 10px;
-	font-size: 13px;
-	background-color: #ff611f;
-	padding: 3px 5px;
-	border-radius: 5px;
-	color: #ffffff;
-}
-
-.promo-banner {
-	margin-top:10px;
-	background: url('images/august_aweomse_promo_banner.png') no-repeat;
-}
-
-.billing-details-checkbox {
-	width: auto;
-}
-
-#current_plan {
-	padding-top: 10px;
-	font-size: 16px;
-}
-
-#current_plan span {
-	color: #ff611f;
-	font-weight: bold;
-}
-
-.promo-text-highlight {
-	background-color: #ff611f;
-	padding: 3px;
-	line-height: 20px;
-	color: #fff;
-	text-shadow: 0px 1px #444;
-	border-radius: 3px;
-	font-weight: bold;
-}
-
-.billing-panel .educational-discount {
-	border: 1px solid #306999;
-	border-radius: 3px;
-	margin-top: 10px;
-	margin-bottom: 10px;
-	box-sizing: border-box;
-	padding: 16px;
-	background-color: #b8d9f4;
-	color: #234f5d;
-
-}
-.billing-panel .educational-discount h4 {
-	color: #1e415d;
-	font-weight: bold;
-	margin: 0px;
-	padding: 0px;
-	margin-bottom: 5px;
-}
-.billing-panel .educational-discount p {
-	margin: 0px;
-}
diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css
index 335624131..12b203347 100644
--- a/airtime_mvc/public/css/styles.css
+++ b/airtime_mvc/public/css/styles.css
@@ -268,7 +268,7 @@ img.logo
     overflow:hidden;
 }
 
-.now-playing-block, .show-block, .on-air-block, .time-info-block, .listen-control-block, .trial-info-block {
+.now-playing-block, .show-block, .on-air-block, .time-info-block, .listen-control-block {
     height:100px;
     float:left;
     margin-right:10px;
@@ -3066,96 +3066,6 @@ tfoot tr th    {
     margin:0;
 }
 
-/*---////////////////////    TRIAL BOX HEADER    ////////////////////---*/
-
-.trial-box    {
-    width:142px;
-    height:38px;
-    display:block;
-    position:fixed;
-    left:160px;
-    bottom:0px;
-    background-color:#222;
-    background-color:rgba(0, 0, 0, 0.7);
-    z-index:101;
-    -moz-border-radius: 3px;
-    -webkit-border-radius: 3px;
-    border-radius: 3px;
-    color:#FFF;
-    font-size:11px;
-    padding:7px;
-}
-.trial-box p    {
-    padding:0 0 3px 0;
-    margin:0 0 5px 0;
-    float:left;
-}
-.trial-box-button a {
-    width:92px;
-    height:14px;
-    display:block;    
-    padding: 1px 3px;
-    -moz-border-radius: 1px;
-    -webkit-border-radius: 1px;
-    border-radius: 1px;
-    text-transform:uppercase;
-    text-align:center;
-    font-family:Arial, Helvetica, sans-serif;
-    font-weight:bold;
-    text-decoration:none;
-    color:#FFFFFF;
-    background-color:#ff5d1a;
-    background: -moz-linear-gradient(top, #ff5d1a 0, #dd4202 100%);
-    background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #ff5d1a), color-stop(100%, #dd4202));
-    box-shadow: rgba(248, 248, 248, 0.4) 0 1px 1px inset;
-    -moz-box-shadow: rgba(248, 248, 248, 0.4) 0 1px 1px inset;
-    -webkit-box-shadow: rgba(248, 248, 248, 0.4) 0 1px 1px inset;
-    float:left;
-}
-.trial-box-button a:hover {
-    background-color:#dd4202;
-    background: -moz-linear-gradient(top, #dd4202 0, #ff5d1a 100%);
-    background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #dd4202), color-stop(100%, #ff5d1a));
-    box-shadow: rgba(248, 248, 248, 0.4) 0 1px 1px inset;
-    -moz-box-shadow: rgba(248, 248, 248, 0.4) 0 1px 1px inset;
-    -webkit-box-shadow: rgba(248, 248, 248, 0.4) 0 1px 1px inset;
-}
-.trial-box-calendar    {
-    float:right;
-    text-align:center;
-    font-weight:bold;
-}
-.trial-box-calendar-white    {
-    font-size:18px;
-    color:#ff5d1a;
-    background:#FFF;
-    width:36px;
-    height:22px;
-    display:block;
-    -webkit-border-top-right-radius: 1px;
-    -moz-border-radius-topright: 1px;    
-    -webkit-border-top-left-radius: 1px;
-    -moz-border-radius-topleft: 1px;    
-}
-.trial-box-calendar-gray    {
-    width:36px;
-    height:14px;
-    display:block;
-    color:#FFF;
-    font-size:11px;
-    padding:1px 0;
-    text-transform:uppercase;
-    background-color:#676767;
-    background: -moz-linear-gradient(top, #7f7f7f 0, #555555 100%);
-    background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #7f7f7f), color-stop(100%, #555555));
-    -webkit-border-bottom-right-radius: 1px;
-    -moz-border-radius-bottomright: 1px;    
-    -webkit-border-bottom-left-radius: 1px;
-    -moz-border-radius-bottomleft: 1px;    
-    box-shadow: rgba(0, 0, 0, 0.4) 0 2px 1px inset;
-    -moz-box-shadow: rgba(0, 0, 0, 0.4) 0 2px 2px inset;
-    -webkit-box-shadow: rgba(0, 0, 0, 0.4) 0 2px 2px inset;
-}
 #stream_url {font-size:12px; line-height: 170%;}
 .stream-setting-content fieldset {border-width:0 1px 1px 1px;}
 
@@ -3442,33 +3352,6 @@ dd .stream-status {
     font-size: 14px !important;
 }
 
-.thankyou-panel
-{
-    width: 400px;
-    margin: 0 auto;
-    margin-bottom: 30px;
-}
-
-.thankyou-panel h3
-{
-    color: #222;
-}
-
-.suspension_notice
-{
-    text-align: center;
-    background-color: #D27A7A;
-    height: 143px;
-    font-size: 16px;
-    font-family: Helvetica, Arial, sans-serif;
-}
-
-.suspension_notice h2
-{
-    padding-bottom: 0px;
-    padding-top: 13px;
-}
-
 .enable-tunein {
     font-weight:bold;
 }
diff --git a/airtime_mvc/public/js/airtime/common/livechat.js b/airtime_mvc/public/js/airtime/common/livechat.js
deleted file mode 100644
index a5a0cd462..000000000
--- a/airtime_mvc/public/js/airtime/common/livechat.js
+++ /dev/null
@@ -1,31 +0,0 @@
-var __lc = {};
-__lc.license = 1083735;
-
-function setupLiveChat() {
-    // this is where we pass custom variables to livechat;
-    // only pass the client id assigned by WHMCS for now
-    __lc.params = [
-        { name: 'client_id', value: livechat_client_id },
-        { name: 'plan_type', value: livechat_plan_type},
-        { name: 'station_url', value: livechat_station_url}
-    ];
-    
-    var lc = document.createElement('script'); lc.type = 'text/javascript'; lc.async = true;
-    lc.src = ('https:' == document.location.protocol ? 'https://' : 'http://') + 'cdn.livechatinc.com/tracking.js';
-    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(lc, s);
-}
-
-$(document).ready(function() {
-    setupLiveChat();
-
-    var lcLoadListener = setInterval(function() {
-        var ifr = document.getElementById('livechat-compact-container');
-        if (ifr) {
-            LC_API.on_chat_state_changed = function(data) {
-                // Hacky... select elements on pages that have different layouts separately
-                $('body > .wrapper, #stream_form > div, #his-tabs').css('padding-bottom', (data.state == 'offline') ? 10 : 40);
-            };
-            clearInterval(lcLoadListener);
-        }
-    }, 100);
-});
\ No newline at end of file
diff --git a/tests/selenium/Account Plans.html b/tests/selenium/Account Plans.html
deleted file mode 100644
index 4c51f4a88..000000000
--- a/tests/selenium/Account Plans.html	
+++ /dev/null
@@ -1,196 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head profile="http://selenium-ide.openqa.org/profiles/test-case">
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-
-<title>Account Plans</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-<thead>
-<tr><td rowspan="1" colspan="3">Account Plans</td></tr>
-</thead><tbody>
-<tr>
-	<td>open</td>
-	<td>/billing/upgrade</td>
-	<td></td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>link=Account Plans</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>id=hobbyist_grid_price</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>id=starter_grid_price</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>id=plus_grid_price</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>id=premium_grid_price</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyText</td>
-	<td>id=hobbyist_grid_price</td>
-	<td>$9.95 / month</td>
-</tr>
-<tr>
-	<td>verifyText</td>
-	<td>id=starter_grid_price</td>
-	<td>$39.95 / month</td>
-</tr>
-<tr>
-	<td>verifyText</td>
-	<td>id=plus_grid_price</td>
-	<td>$64.95 / month</td>
-</tr>
-<tr>
-	<td>verifyText</td>
-	<td>id=premium_grid_price</td>
-	<td>$99.95 / month</td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>id=current_plan</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>id=newproductbillingcycle-monthly</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>id=newproductbillingcycle-annually</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>id=newproductid-25</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>id=newproductid-26</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>id=newproductid-27</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>id=newproductid-28</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>css=span.subtotal</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>id=firstname</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>id=lastname</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>id=companyname</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>id=email</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>id=address1</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>id=address2</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>id=city</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>id=state</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>id=postcode</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>id=country</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>id=phonenumber</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>id=securityqid</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>id=securityqans</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>id=customfields-7</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>id=customfields-71</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>id=paymentmethod-paypal</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>//div[@id='total_box']/b[2]</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>css=input[type=&quot;submit&quot;]</td>
-	<td></td>
-</tr>
-</tbody></table>
-</body>
-</html>
diff --git a/tests/selenium/Airtime.html b/tests/selenium/Airtime.html
index 8ae8c5bf1..c15631cb4 100644
--- a/tests/selenium/Airtime.html
+++ b/tests/selenium/Airtime.html
@@ -14,14 +14,9 @@
 <tr><td><a href="Library Skeleton Present.html">Library Skeleton Present</a></td></tr>
 <tr><td><a href="Calendar Skeleton Present.html">Calendar Skeleton Present</a></td></tr>
 <tr><td><a href="System Menu Contents.html">System Menu Contents</a></td></tr>
-<tr><td><a href="Billing Menu Contents.html">Billing Menu Contents</a></td></tr>
 <tr><td><a href="Calendar Add Show Skeleton.html">Calendar Add Show Skeleton</a></td></tr>
 <tr><td><a href="Calendar Day Week Month Views.html">Calendar Day Week Month Views</a></td></tr>
 <tr><td><a href="Preferences Skeletons.html">Preferences Skeletons</a></td></tr>
-<tr><td><a href="Billing Account Details.html">Billing Account Details</a></td></tr>
-<tr><td><a href="Account Plans.html">Account Plans</a></td></tr>
-<tr><td><a href="Invoices Skeleton.html">Invoices Skeleton</a></td></tr>
-<tr><td><a href="Listen Button Skeleton.html">Listen Button Skeleton</a></td></tr>
 </tbody></table>
 </body>
 </html>
diff --git a/tests/selenium/Billing Account Details.html b/tests/selenium/Billing Account Details.html
deleted file mode 100644
index e09acc9c8..000000000
--- a/tests/selenium/Billing Account Details.html	
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head profile="http://selenium-ide.openqa.org/profiles/test-case">
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-
-<title>Billing Account Details</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-<thead>
-<tr><td rowspan="1" colspan="3">Billing Account Details</td></tr>
-</thead><tbody>
-<tr>
-	<td>open</td>
-	<td>/billing/client</td>
-	<td></td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>link=Account Details</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>id=firstname</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>id=lastname</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>id=companyname</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>id=email</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>id=address1</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>id=address2</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>id=city</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>id=state</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>id=postcode</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>id=country</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>id=phonenumber</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>id=securityqid</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>id=securityqans</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>id=customfields-7</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>id=customfields-71</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>id=password2</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>id=password2verify</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>id=submit</td>
-	<td></td>
-</tr>
-
-</tbody></table>
-</body>
-</html>
diff --git a/tests/selenium/Billing Menu Contents.html b/tests/selenium/Billing Menu Contents.html
deleted file mode 100644
index af5d43247..000000000
--- a/tests/selenium/Billing Menu Contents.html	
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head profile="http://selenium-ide.openqa.org/profiles/test-case">
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-
-<title>Billing Menu Contents</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-<thead>
-<tr><td rowspan="1" colspan="3">Billing Menu Contents</td></tr>
-</thead><tbody>
-<tr>
-	<td>open</td>
-	<td>/Schedule</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>link=Account Details</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>link=View Invoices</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>link=Account Plans</td>
-	<td></td>
-</tr>
-
-</tbody></table>
-</body>
-</html>
diff --git a/tests/selenium/Invoices Skeleton.html b/tests/selenium/Invoices Skeleton.html
deleted file mode 100644
index bad141d2c..000000000
--- a/tests/selenium/Invoices Skeleton.html	
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head profile="http://selenium-ide.openqa.org/profiles/test-case">
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-
-<title>Invoices Skeleton</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-<thead>
-<tr><td rowspan="1" colspan="3">Invoices Skeleton</td></tr>
-</thead><tbody>
-<tr>
-	<td>open</td>
-	<td>/billing/upgrade</td>
-	<td></td>
-</tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>link=View Invoices</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>//div[@id='content']/div</td>
-	<td></td>
-</tr>
-
-</tbody></table>
-</body>
-</html>
diff --git a/tests/selenium/Listen Button Skeleton.html b/tests/selenium/Listen Button Skeleton.html
deleted file mode 100644
index b0f783879..000000000
--- a/tests/selenium/Listen Button Skeleton.html	
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head profile="http://selenium-ide.openqa.org/profiles/test-case">
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-
-<title>Listen Button Skeleton</title>
-</head>
-<body>
-<table cellpadding="1" cellspacing="1" border="1">
-<thead>
-<tr><td rowspan="1" colspan="3">Listen Button Skeleton</td></tr>
-</thead><tbody>
-<tr>
-	<td>open</td>
-	<td>/billing/invoices</td>
-	<td></td>
-</tr>
-<tr>
-	<td>click</td>
-	<td>css=a.listen-control-button &gt; span</td>
-	<td></td>
-</tr>
-<tr>
-	<td>waitForPopUp</td>
-	<td>name</td>
-	<td>30000</td>
-</tr>
-<tr>
-	<td>selectWindow</td>
-	<td>name=name</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>id=combo-box</td>
-	<td></td>
-</tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>id=popup-link</td>
-	<td></td>
-</tr>
-
-</tbody></table>
-</body>
-</html>