=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/setting/SystemSettingManager.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/setting/SystemSettingManager.java	2015-10-06 15:16:47 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/setting/SystemSettingManager.java	2015-10-06 15:28:14 +0000
@@ -55,14 +55,7 @@
     String KEY_FLAG = "keyFlag";
     String KEY_FLAG_IMAGE = "keyFlagImage";
     String KEY_START_MODULE = "startModule";
-    String KEY_FORUM_INTEGRATION = "forumIntegration";
-    String KEY_OMIT_INDICATORS_ZERO_NUMERATOR_DATAMART = "omitIndicatorsZeroNumeratorDataMart";
-    String KEY_REPORT_TEMPLATE_DIRECTORY = "reportTemplateDirectory";
-    String KEY_GOOGLE_MAPS_API_KEY = "googleMapsAPIKey";
     String KEY_FACTOR_OF_DEVIATION = "factorDeviation";
-    String KEY_TRACKED_ENTITY_EXCEL_TEMPLATE_FILE_NAME = "trackedEntityExcelTemplateFileName";
-    String KEY_DATAMART_TASK = "keyDataMartTask";
-    String KEY_DATASETCOMPLETENESS_TASK = "keyDataSetCompletenessTask";
     String KEY_EMAIL_HOST_NAME = "keyEmailHostName";
     String KEY_EMAIL_PORT = "keyEmailPort";
     String KEY_EMAIL_USERNAME = "keyEmailUsername";
@@ -70,10 +63,8 @@
     String KEY_EMAIL_TLS = "keyEmailTls";
     String KEY_EMAIL_SENDER = "keyEmailSender";
     String KEY_INSTANCE_BASE_URL = "keyInstanceBaseUrl";
-    String KEY_SCHEDULED_PERIOD_TYPES = "keyScheduledPeriodTypes";
     String KEY_SCHEDULED_TASKS = "keySchedTasks";
-    String KEY_ORGUNITGROUPSET_AGG_LEVEL = "orgUnitGroupSetAggregationLevel";
-    String KEY_SMS_CONFIG = "SMS_CONFIG";
+    String KEY_SMS_CONFIG = "keySmsConfig";
     String KEY_CACHE_STRATEGY = "keyCacheStrategy";
     String KEY_TIME_FOR_SENDING_MESSAGE = "timeSendingMessage";
     String KEY_SEND_MESSAGE_SCHEDULED_TASKS = "sendMessageScheduled";
@@ -123,7 +114,6 @@
     int DEFAULT_MAX_NUMBER_OF_ATTEMPTS = 20;
     int DEFAULT_TIMEFRAME_MINUTES = 1;
     double DEFAULT_FACTOR_OF_DEVIATION = 2.0;
-    int DEFAULT_ORGUNITGROUPSET_AGG_LEVEL = 3;
     String DEFAULT_GOOGLE_MAPS_API_KEY = "ABQIAAAAut6AhySExnYIXm5s2OFIkxRKNzJ-_9njnryRTbvC6CtrS4sRvRREWnxwlZUa630pLuPf3nD9i4fq9w";
     String DEFAULT_START_MODULE = "dhis-web-dashboard-integration";
     String DEFAULT_APPLICATION_TITLE = "District Health Information Software 2";
@@ -145,7 +135,6 @@
             put( CalendarService.KEY_CALENDAR, CalendarService.DEFAULT_CALENDAR );
             put( CalendarService.KEY_DATE_FORMAT, CalendarService.DEFAULT_DATE_FORMAT );
             put( KEY_FACTOR_OF_DEVIATION, DEFAULT_FACTOR_OF_DEVIATION );
-            put( KEY_ORGUNITGROUPSET_AGG_LEVEL, DEFAULT_ORGUNITGROUPSET_AGG_LEVEL );
             put( KEY_START_MODULE, DEFAULT_START_MODULE );
             put( KEY_APPLICATION_TITLE, DEFAULT_APPLICATION_TITLE );
             put( KEY_EMAIL_PORT, DEFAULT_EMAIL_PORT );

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/interceptor/SystemSettingInterceptor.java'
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/interceptor/SystemSettingInterceptor.java	2015-06-17 13:37:50 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/interceptor/SystemSettingInterceptor.java	2015-10-06 15:28:14 +0000
@@ -107,7 +107,6 @@
         map.put( KEY_FLAG, systemSettingManager.getSystemSetting( KEY_FLAG, DEFAULT_FLAG ) );
         map.put( KEY_FLAG_IMAGE, systemSettingManager.getFlagImage() );
         map.put( KEY_START_MODULE, systemSettingManager.getSystemSetting( KEY_START_MODULE, DEFAULT_START_MODULE ) );
-        map.put( KEY_OMIT_INDICATORS_ZERO_NUMERATOR_DATAMART, systemSettingManager.getSystemSetting( KEY_OMIT_INDICATORS_ZERO_NUMERATOR_DATAMART, false ) );
         map.put( KEY_FACTOR_OF_DEVIATION, systemSettingManager.getSystemSetting( KEY_FACTOR_OF_DEVIATION, DEFAULT_FACTOR_OF_DEVIATION ) );
         map.put( KEY_PHONE_NUMBER_AREA_CODE, systemSettingManager.getSystemSetting( KEY_PHONE_NUMBER_AREA_CODE, "" ) );
         map.put( KEY_MULTI_ORGANISATION_UNIT_FORMS, systemSettingManager.getSystemSetting( KEY_MULTI_ORGANISATION_UNIT_FORMS, false ) );

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/SetGeneralSettingsAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/SetGeneralSettingsAction.java	2015-03-30 14:13:48 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/SetGeneralSettingsAction.java	2015-10-06 15:28:14 +0000
@@ -37,7 +37,6 @@
 import static org.hisp.dhis.setting.SystemSettingManager.KEY_HELP_PAGE_LINK;
 import static org.hisp.dhis.setting.SystemSettingManager.KEY_INSTANCE_BASE_URL;
 import static org.hisp.dhis.setting.SystemSettingManager.KEY_MULTI_ORGANISATION_UNIT_FORMS;
-import static org.hisp.dhis.setting.SystemSettingManager.KEY_OMIT_INDICATORS_ZERO_NUMERATOR_DATAMART;
 import static org.hisp.dhis.setting.SystemSettingManager.KEY_PHONE_NUMBER_AREA_CODE;
 import static org.hisp.dhis.setting.SystemSettingManager.KEY_SYSTEM_NOTIFICATIONS_EMAIL;
 import static org.hisp.dhis.setting.SystemSettingManager.KEY_ANALYSIS_RELATIVE_PERIOD;
@@ -168,13 +167,6 @@
         this.analysisRelativePeriod = analysisRelativePeriod;
     }
 
-    private Boolean omitIndicatorsZeroNumeratorDataMart;
-
-    public void setOmitIndicatorsZeroNumeratorDataMart( Boolean omitIndicatorsZeroNumeratorDataMart )
-    {
-        this.omitIndicatorsZeroNumeratorDataMart = omitIndicatorsZeroNumeratorDataMart;
-    }
-
     private Double factorDeviation;
 
     public void setFactorDeviation( Double factorDeviation )
@@ -269,7 +261,6 @@
         systemSettingManager.saveSystemSetting( KEY_CACHE_STRATEGY, cacheStrategy );
         systemSettingManager.saveSystemSetting( KEY_ANALYTICS_MAX_LIMIT, analyticsMaxLimit );
         systemSettingManager.saveSystemSetting( KEY_DATABASE_SERVER_CPUS, databaseServerCpus );
-        systemSettingManager.saveSystemSetting( KEY_OMIT_INDICATORS_ZERO_NUMERATOR_DATAMART, omitIndicatorsZeroNumeratorDataMart );
         systemSettingManager.saveSystemSetting( KEY_FACTOR_OF_DEVIATION, factorDeviation );
         systemSettingManager.saveSystemSetting( KEY_PHONE_NUMBER_AREA_CODE, phoneNumberAreaCode );
         systemSettingManager.saveSystemSetting( KEY_MULTI_ORGANISATION_UNIT_FORMS, multiOrganisationUnitForms );

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemGeneralSettings.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemGeneralSettings.vm	2015-07-31 11:29:52 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemGeneralSettings.vm	2015-10-06 15:28:14 +0000
@@ -12,7 +12,6 @@
         feedbackRecipients: getFieldValue('feedbackRecipients'),
         offlineOrganisationUnitLevel: getFieldValue('offlineOrganisationUnitLevel'),
         systemNotificationsEmail: getFieldValue('systemNotificationsEmail'),
-        omitIndicatorsZeroNumeratorDataMart: jQuery('#omitIndicatorsZeroNumeratorDataMart').is(':checked'),
         factorDeviation: getFieldValue('factorDeviation'),
         phoneNumberAreaCode: getFieldValue('phoneNumberAreaCode'),
         googleAnalyticsUA: getFieldValue('googleAnalyticsUA'),
@@ -174,11 +173,6 @@
 </div>
 
 <div class="setting">
-    <input type="checkbox" id="omitIndicatorsZeroNumeratorDataMart" name="omitIndicatorsZeroNumeratorDataMart" #if( $omitIndicatorsZeroNumeratorDataMart )checked="checked"#end>
-    <label for="omitIndicatorsZeroNumeratorDataMart">$i18n.getString( "omit_indicators_zero_numerator_data_mart" )</label>
-</div>
-
-<div class="setting">
     <input type="checkbox" id="analyticsMaintenanceMode" name="analyticsMaintenanceMode" #if( $keyAnalyticsMaintenanceMode )checked="checked"#end>
     <label for="analyticsMaintenanceMode">$i18n.getString( "put_analytics_in_maintenance_mode" ) <span class="tipText">($i18n.getString( "returns" ) 503)</span></label>
 </div>