diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/DeviceManagementConfig.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/DeviceManagementConfig.java
index 29077c28147..bfe8216981d 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/DeviceManagementConfig.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/DeviceManagementConfig.java
@@ -23,7 +23,7 @@ import javax.xml.bind.annotation.XmlRootElement;
 @XmlRootElement(name = "DeviceMgtConfiguration")
 public final class DeviceManagementConfig {
 
-    private String deviceMgtProvider;
+    private DeviceManagementRepository deviceMgtRepository;
 
     @XmlElement(name = "ManagementRepository", nillable = false)
     public DeviceManagementRepository getDeviceMgtRepository() {
@@ -34,6 +34,4 @@ public final class DeviceManagementConfig {
         this.deviceMgtRepository = deviceMgtRepository;
     }
 
-    private DeviceManagementRepository deviceMgtRepository;
-
 }
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/DeviceManagementRepository.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/DeviceManagementRepository.java
index 6737e73ae13..39fc6b4bd76 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/DeviceManagementRepository.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/DeviceManagementRepository.java
@@ -12,10 +12,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.wso2.carbon.device.mgt.core.config;
 
-
 import org.wso2.carbon.device.mgt.core.config.datasource.DataSourceConfig;
 
 import javax.xml.bind.annotation.XmlElement;
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/datasource/DSXMLConfig.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/datasource/DSXMLConfig.java
deleted file mode 100644
index 61806962996..00000000000
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/datasource/DSXMLConfig.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (c) 2014, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- * WSO2 Inc. licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.wso2.carbon.device.mgt.core.config.datasource;
-
-import javax.xml.bind.Marshaller;
-
-public interface DSXMLConfig {
-
-	public Marshaller getDSMarshaller();
-
-}
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/datasource/DataSourceConfig.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/datasource/DataSourceConfig.java
index 43da64f852f..07f5aab98d0 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/datasource/DataSourceConfig.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/datasource/DataSourceConfig.java
@@ -25,7 +25,6 @@ import javax.xml.bind.annotation.XmlRootElement;
 public class DataSourceConfig {
 
 	private JNDILookupDefinition jndiLookupDefintion;
-	private RDBMSConfig rdbmsConfig;
 
 	@XmlElement(name = "JndiLookupDefinition", nillable = true)
 	public JNDILookupDefinition getJndiLookupDefintion() {
@@ -36,13 +35,4 @@ public class DataSourceConfig {
 		this.jndiLookupDefintion = jndiLookupDefintion;
 	}
 
-	@XmlElement(name = "Definition", nillable = true)
-	public RDBMSConfig getRdbmsConfiguration() {
-		return rdbmsConfig;
-	}
-
-	public void setRdbmsConfiguration(RDBMSConfig rdbmsConfig) {
-		this.rdbmsConfig = rdbmsConfig;
-	}
-
 }
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/datasource/RDBMSConfig.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/datasource/RDBMSConfig.java
deleted file mode 100644
index c67c6640c98..00000000000
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/datasource/RDBMSConfig.java
+++ /dev/null
@@ -1,412 +0,0 @@
-/*
- * Copyright (c) 2014, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- * WSO2 Inc. licenses this file to you under the Apache License,
- * Version 2.0 (the "License"); you may not use this file except
- * in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.wso2.carbon.device.mgt.core.config.datasource;
-
-import javax.xml.bind.Marshaller;
-import javax.xml.bind.annotation.*;
-import java.util.List;
-
-/**
- * Class for hold data source configuration properties at parsing with JAXB
- */
-@XmlRootElement(name = "Definition")
-public class RDBMSConfig implements DSXMLConfig {
-
-	private String url;
-	private String driverClassName;
-	private String username;
-	private String password;
-	private Boolean defaultAutoCommit;
-	private Boolean defaultReadOnly;
-	private String defaultTransactionIsolation;
-	private String defaultCatalog;
-	private Integer maxActive;
-	private Integer maxIdle;
-	private Integer minIdle;
-	private Integer initialSize;
-	private Integer maxWait;
-	private Boolean testOnBorrow;
-	private Boolean testOnReturn;
-	private Boolean testWhileIdle;
-	private String validationQuery;
-	private String validatorClassName;
-	private Integer timeBetweenEvictionRunsMillis;
-	private Integer numTestsPerEvictionRun;
-	private Integer minEvictableIdleTimeMillis;
-	private Boolean accessToUnderlyingConnectionAllowed;
-	private Boolean removeAbandoned;
-	private Integer removeAbandonedTimeout;
-	private Boolean logAbandoned;
-	private String connectionProperties;
-	private String initSQL;
-	private String jdbcInterceptors;
-	private Long validationInterval;
-	private Boolean jmxEnabled;
-	private Boolean fairQueue;
-	private Integer abandonWhenPercentageFull;
-	private Long maxAge;
-	private Boolean useEquals;
-	private Integer suspectTimeout;
-	private Boolean alternateUsernameAllowed;
-	private String dataSourceClassName;
-	private List<DataSourceProperty> dataSourceProps;
-
-	public RDBMSConfig() {
-	}
-
-
-	@XmlElement(name = "Url", nillable = false)
-	public String getUrl() {
-		return url;
-	}
-
-	public void setUrl(String url) {
-		this.url = url;
-	}
-
-	@XmlElement(name = "DriverClassName", nillable = false)
-	public String getDriverClassName() {
-		return driverClassName;
-	}
-
-	public void setDriverClassName(String driverClassName) {
-		this.driverClassName = driverClassName;
-	}
-
-	@XmlElement(name = "Username", nillable = false)
-	public String getUsername() {
-		return username;
-	}
-
-	public void setUsername(String username) {
-		this.username = username;
-	}
-
-	@XmlElement(name = "Password", nillable = false)
-	public String getPassword() {
-		return password;
-	}
-
-	public void setPassword(String password) {
-		this.password = password;
-	}
-
-	public Boolean getDefaultAutoCommit() {
-		return defaultAutoCommit;
-	}
-
-	public void setDefaultAutoCommit(Boolean defaultAutoCommit) {
-		this.defaultAutoCommit = defaultAutoCommit;
-	}
-
-	public Boolean getDefaultReadOnly() {
-		return defaultReadOnly;
-	}
-
-	public void setDefaultReadOnly(Boolean defaultReadOnly) {
-		this.defaultReadOnly = defaultReadOnly;
-	}
-
-	public String getDefaultTransactionIsolation() {
-		return defaultTransactionIsolation;
-	}
-
-	public void setDefaultTransactionIsolation(String defaultTransactionIsolation) {
-		this.defaultTransactionIsolation = defaultTransactionIsolation;
-	}
-
-	public String getDefaultCatalog() {
-		return defaultCatalog;
-	}
-
-	public void setDefaultCatalog(String defaultCatalog) {
-		this.defaultCatalog = defaultCatalog;
-	}
-
-	public Integer getMaxActive() {
-		return maxActive;
-	}
-
-	public void setMaxActive(Integer maxActive) {
-		this.maxActive = maxActive;
-	}
-
-	public Integer getMaxIdle() {
-		return maxIdle;
-	}
-
-	public void setMaxIdle(Integer maxIdle) {
-		this.maxIdle = maxIdle;
-	}
-
-	public Integer getMinIdle() {
-		return minIdle;
-	}
-
-	public void setMinIdle(Integer minIdle) {
-		this.minIdle = minIdle;
-	}
-
-	public Integer getInitialSize() {
-		return initialSize;
-	}
-
-	public void setInitialSize(Integer initialSize) {
-		this.initialSize = initialSize;
-	}
-
-	public Integer getMaxWait() {
-		return maxWait;
-	}
-
-	public void setMaxWait(Integer maxWait) {
-		this.maxWait = maxWait;
-	}
-
-	public Boolean getTestOnBorrow() {
-		return testOnBorrow;
-	}
-
-	public void setTestOnBorrow(Boolean testOnBorrow) {
-		this.testOnBorrow = testOnBorrow;
-	}
-
-	public Boolean getTestOnReturn() {
-		return testOnReturn;
-	}
-
-	public void setTestOnReturn(Boolean testOnReturn) {
-		this.testOnReturn = testOnReturn;
-	}
-
-	public Boolean getTestWhileIdle() {
-		return testWhileIdle;
-	}
-
-	public void setTestWhileIdle(Boolean testWhileIdle) {
-		this.testWhileIdle = testWhileIdle;
-	}
-
-	public String getValidationQuery() {
-		return validationQuery;
-	}
-
-	public void setValidationQuery(String validationQuery) {
-		this.validationQuery = validationQuery;
-	}
-
-	public String getValidatorClassName() {
-		return validatorClassName;
-	}
-
-	public void setValidatorClassName(String validatorClassName) {
-		this.validatorClassName = validatorClassName;
-	}
-
-	public Integer getTimeBetweenEvictionRunsMillis() {
-		return timeBetweenEvictionRunsMillis;
-	}
-
-	public void setTimeBetweenEvictionRunsMillis(Integer timeBetweenEvictionRunsMillis) {
-		this.timeBetweenEvictionRunsMillis = timeBetweenEvictionRunsMillis;
-	}
-
-	public Integer getNumTestsPerEvictionRun() {
-		return numTestsPerEvictionRun;
-	}
-
-	public void setNumTestsPerEvictionRun(Integer numTestsPerEvictionRun) {
-		this.numTestsPerEvictionRun = numTestsPerEvictionRun;
-	}
-
-	public Integer getMinEvictableIdleTimeMillis() {
-		return minEvictableIdleTimeMillis;
-	}
-
-	public void setMinEvictableIdleTimeMillis(Integer minEvictableIdleTimeMillis) {
-		this.minEvictableIdleTimeMillis = minEvictableIdleTimeMillis;
-	}
-
-	public Boolean getAccessToUnderlyingConnectionAllowed() {
-		return accessToUnderlyingConnectionAllowed;
-	}
-
-	public void setAccessToUnderlyingConnectionAllowed(Boolean accessToUnderlyingConnectionAllowed) {
-		this.accessToUnderlyingConnectionAllowed = accessToUnderlyingConnectionAllowed;
-	}
-
-	public Boolean getRemoveAbandoned() {
-		return removeAbandoned;
-	}
-
-	public void setRemoveAbandoned(Boolean removeAbandoned) {
-		this.removeAbandoned = removeAbandoned;
-	}
-
-	public Integer getRemoveAbandonedTimeout() {
-		return removeAbandonedTimeout;
-	}
-
-	public void setRemoveAbandonedTimeout(Integer removeAbandonedTimeout) {
-		this.removeAbandonedTimeout = removeAbandonedTimeout;
-	}
-
-	public Boolean getLogAbandoned() {
-		return logAbandoned;
-	}
-
-	public void setLogAbandoned(Boolean logAbandoned) {
-		this.logAbandoned = logAbandoned;
-	}
-
-	public String getConnectionProperties() {
-		return connectionProperties;
-	}
-
-	public void setConnectionProperties(String connectionProperties) {
-		this.connectionProperties = connectionProperties;
-	}
-
-	public String getInitSQL() {
-		return initSQL;
-	}
-
-	public void setInitSQL(String initSQL) {
-		this.initSQL = initSQL;
-	}
-
-	public String getJdbcInterceptors() {
-		return jdbcInterceptors;
-	}
-
-	public void setJdbcInterceptors(String jdbcInterceptors) {
-		this.jdbcInterceptors = jdbcInterceptors;
-	}
-
-	public Long getValidationInterval() {
-		return validationInterval;
-	}
-
-	public void setValidationInterval(Long validationInterval) {
-		this.validationInterval = validationInterval;
-	}
-
-	public Boolean getJmxEnabled() {
-		return jmxEnabled;
-	}
-
-	public void setJmxEnabled(Boolean jmxEnabled) {
-		this.jmxEnabled = jmxEnabled;
-	}
-
-	public Boolean getFairQueue() {
-		return fairQueue;
-	}
-
-	public void setFairQueue(Boolean fairQueue) {
-		this.fairQueue = fairQueue;
-	}
-
-	public Integer getAbandonWhenPercentageFull() {
-		return abandonWhenPercentageFull;
-	}
-
-	public void setAbandonWhenPercentageFull(Integer abandonWhenPercentageFull) {
-		this.abandonWhenPercentageFull = abandonWhenPercentageFull;
-	}
-
-	public Long getMaxAge() {
-		return maxAge;
-	}
-
-	public void setMaxAge(Long maxAge) {
-		this.maxAge = maxAge;
-	}
-
-	public Boolean getUseEquals() {
-		return useEquals;
-	}
-
-	public void setUseEquals(Boolean useEquals) {
-		this.useEquals = useEquals;
-	}
-
-	public Integer getSuspectTimeout() {
-		return suspectTimeout;
-	}
-
-	public void setSuspectTimeout(Integer suspectTimeout) {
-		this.suspectTimeout = suspectTimeout;
-	}
-
-	public Boolean getAlternateUsernameAllowed() {
-		return alternateUsernameAllowed;
-	}
-
-	public void setAlternateUsernameAllowed(Boolean alternateUsernameAllowed) {
-		this.alternateUsernameAllowed = alternateUsernameAllowed;
-	}
-
-	@XmlElement(name = "DataSourceClassName", nillable = false)
-	public String getDataSourceClassName() {
-		return dataSourceClassName;
-	}
-
-	public void setDataSourceClassName(String dataSourceClassName) {
-		this.dataSourceClassName = dataSourceClassName;
-	}
-
-	@XmlElementWrapper(name = "DataSourceProps", nillable = false)
-	@XmlElement(name = "Property", nillable = false)
-	public List<DataSourceProperty> getDataSourceProps() {
-		return dataSourceProps;
-	}
-
-	public void setDataSourceProps(List<DataSourceProperty> dataSourceProps) {
-		this.dataSourceProps = dataSourceProps;
-	}
-
-	public Marshaller getDSMarshaller() {
-		return null;
-	}
-
-	@XmlRootElement(name = "Property")
-	public static class DataSourceProperty {
-
-		private String name;
-
-		private String value;
-
-		@XmlAttribute(name = "name")
-		public String getName() {
-			return name;
-		}
-
-		public void setName(String name) {
-			this.name = name;
-		}
-
-		@XmlValue
-		public String getValue() {
-			return value;
-		}
-
-		public void setValue(String value) {
-			this.value = value;
-		}
-	}
-
-}
-
diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/internal/DeviceManagementServiceComponent.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/internal/DeviceManagementServiceComponent.java
index 2d40aaed874..2fc8e407df2 100644
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/internal/DeviceManagementServiceComponent.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/internal/DeviceManagementServiceComponent.java
@@ -52,15 +52,18 @@ public class DeviceManagementServiceComponent {
         try {
             /* Initializing Device Management Configuration */
             DeviceConfigurationManager.getInstance().initConfig();
+            DeviceManagementDataHolder.getInstance().setDeviceManagementRepository(new DeviceManagementRepository());
 
             DataSourceConfig config = DeviceConfigurationManager.getInstance().getDataSourceConfig();
             DeviceManagementDAOFactory.init(config);
 
-            DeviceManagementDataHolder.getInstance().setDeviceManagementRepository(new DeviceManagementRepository());
-
+            /* If -Dsetup option enabled then create device management database schema */
             String setupOption = System.getProperty("setup");
-            /* If -Dsetup option specified then create device management database schema */
             if (setupOption != null) {
+                if (log.isDebugEnabled()) {
+                    log.debug("-Dsetup is enabled. Device management repository schema initialization is about " +
+                            "to begin");
+                }
                 setupDeviceManagementSchema(config);
             }
 
@@ -75,9 +78,8 @@ public class DeviceManagementServiceComponent {
     }
 
     private void setupDeviceManagementSchema(DataSourceConfig config) throws DeviceManagementException {
-        log.info("Setup option specified");
         DeviceManagementSchemaInitializer initializer = new DeviceManagementSchemaInitializer(config);
-        log.info("Creating Meta Data tables");
+        log.info("Initializing device management repository database schema");
         try {
             initializer.createRegistryDatabase();
         } catch (Exception e) {