--- a/agent/core/src/main/java/com/redhat/thermostat/agent/config/AgentConfigsUtils.java	Wed Sep 06 11:49:23 2017 +0200
+++ b/agent/core/src/main/java/com/redhat/thermostat/agent/config/AgentConfigsUtils.java	Thu Sep 07 17:48:06 2017 +0200
@@ -80,11 +80,6 @@
             }
         }
 
-        String db = properties.getProperty(AgentProperties.DB_URL.name());
-        if (db != null) {
-            configuration.setDatabaseURL(db);
-        }
-        
         String saveOnExit = properties.getProperty(AgentProperties.SAVE_ON_EXIT.name());
         if (saveOnExit != null) {
             configuration.setPurge(!Boolean.parseBoolean(saveOnExit));

--- a/agent/core/src/main/java/com/redhat/thermostat/agent/config/AgentProperties.java	Wed Sep 06 11:49:23 2017 +0200
+++ b/agent/core/src/main/java/com/redhat/thermostat/agent/config/AgentProperties.java	Thu Sep 07 17:48:06 2017 +0200
@@ -38,7 +38,6 @@
 
 public enum AgentProperties {
 
-    DB_URL,
     SAVE_ON_EXIT,
 
     KEYCLOAK_ENABLED,

--- a/agent/core/src/main/java/com/redhat/thermostat/agent/config/AgentStartupConfiguration.java	Wed Sep 06 11:49:23 2017 +0200
+++ b/agent/core/src/main/java/com/redhat/thermostat/agent/config/AgentStartupConfiguration.java	Thu Sep 07 17:48:06 2017 +0200
@@ -36,12 +36,9 @@
 
 package com.redhat.thermostat.agent.config;
 
-import com.redhat.thermostat.storage.config.StartupConfiguration;
-
-public class AgentStartupConfiguration implements StartupConfiguration {
+public class AgentStartupConfiguration {
 
     private boolean purge;
-    private String dbUrl;
     private long startTime;
 
     private boolean keycloakEnabled;
@@ -53,15 +50,6 @@
     AgentStartupConfiguration() {
     }
     
-    @Override
-    public String getDBConnectionString() {
-        return dbUrl;
-    }
-
-    public void setDatabaseURL(String url) {
-        this.dbUrl = url;
-    }
-    
     // TODO: that should be a friend, we only want the Service to set this value
     public void setStartTime(long startTime) {
         this.startTime = startTime;

--- a/agent/core/src/test/java/com/redhat/thermostat/agent/config/AgentConfigsUtilsTest.java	Wed Sep 06 11:49:23 2017 +0200
+++ b/agent/core/src/test/java/com/redhat/thermostat/agent/config/AgentConfigsUtilsTest.java	Thu Sep 07 17:48:06 2017 +0200
@@ -64,15 +64,6 @@
     }
     
     @Test
-    public void testSystemDbUrl() throws InvalidConfigurationException, IOException {
-        Properties sysProps = createSystemProperties();
-        setConfigs(sysProps, new Properties());
-        AgentStartupConfiguration config = AgentConfigsUtils.createAgentConfigs();
-
-        Assert.assertEquals("http://1.2.3.4:9001/hello", config.getDBConnectionString());
-    }
-    
-    @Test
     public void testSystemPurgeProp() throws InvalidConfigurationException, IOException {
         Properties sysProps = createSystemProperties();
         setConfigs(sysProps, new Properties());
@@ -82,16 +73,6 @@
     }
     
     @Test
-    public void testUserDbUrl() throws InvalidConfigurationException, IOException {
-        Properties sysProps = createSystemProperties();
-        Properties userProps = createUserProperties();
-        setConfigs(sysProps, userProps);
-        AgentStartupConfiguration config = AgentConfigsUtils.createAgentConfigs();        
-
-        Assert.assertEquals("http://5.6.7.8:9002/world", config.getDBConnectionString());
-    }
-    
-    @Test
     public void testUserPurgeProp() throws InvalidConfigurationException, IOException {
         Properties sysProps = createSystemProperties();
         Properties userProps = createUserProperties();

--- a/agent/core/src/test/java/com/redhat/thermostat/agent/internal/AgentApplicationTest.java	Wed Sep 06 11:49:23 2017 +0200
+++ b/agent/core/src/test/java/com/redhat/thermostat/agent/internal/AgentApplicationTest.java	Thu Sep 07 17:48:06 2017 +0200
@@ -93,7 +93,6 @@
         context = new StubBundleContext();
 
         AgentStartupConfiguration config = mock(AgentStartupConfiguration.class);
-        when(config.getDBConnectionString()).thenReturn("test string; please ignore");
 
         configCreator = mock(ConfigurationCreator.class);
         when(configCreator.create()).thenReturn(config);

--- a/storage/core/src/main/java/com/redhat/thermostat/storage/config/StartupConfiguration.java	Wed Sep 06 11:49:23 2017 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-/*
- * Copyright 2012-2017 Red Hat, Inc.
- *
- * This file is part of Thermostat.
- *
- * Thermostat is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published
- * by the Free Software Foundation; either version 2, or (at your
- * option) any later version.
- *
- * Thermostat is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Thermostat; see the file COPYING.  If not see
- * <http://www.gnu.org/licenses/>.
- *
- * Linking this code with other modules is making a combined work
- * based on this code.  Thus, the terms and conditions of the GNU
- * General Public License cover the whole combination.
- *
- * As a special exception, the copyright holders of this code give
- * you permission to link this code with independent modules to
- * produce an executable, regardless of the license terms of these
- * independent modules, and to copy and distribute the resulting
- * executable under terms of your choice, provided that you also
- * meet, for each linked independent module, the terms and conditions
- * of the license of that module.  An independent module is a module
- * which is not derived from or based on this code.  If you modify
- * this code, you may extend this exception to your version of the
- * library, but you are not obligated to do so.  If you do not wish
- * to do so, delete this exception statement from your version.
- */
-
-package com.redhat.thermostat.storage.config;
-
-public interface StartupConfiguration {
-
-    String getDBConnectionString();
-}
-