Merge pull request #1481 from smartdevicelink/feature/remove_deprecated_apis_part3

Remove Deprecated APIs Part 3

31 files changed, 58 insertions, 1366 deletions

diff --git a/android/hello_sdl_android/src/main/java/com/sdl/hellosdlandroid/SdlService.java b/android/hello_sdl_android/src/main/java/com/sdl/hellosdlandroid/SdlService.java
index fbfcfdabc..2d20be1a3 100755
--- a/android/hello_sdl_android/src/main/java/com/sdl/hellosdlandroid/SdlService.java
+++ b/android/hello_sdl_android/src/main/java/com/sdl/hellosdlandroid/SdlService.java
@@ -26,12 +26,12 @@ import com.smartdevicelink.managers.screen.menu.VoiceCommand;
 import com.smartdevicelink.managers.screen.menu.VoiceCommandSelectionListener;
 import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.proxy.RPCNotification;
-import com.smartdevicelink.proxy.TTSChunkFactory;
 import com.smartdevicelink.proxy.rpc.Alert;
 import com.smartdevicelink.proxy.rpc.OnButtonEvent;
 import com.smartdevicelink.proxy.rpc.OnButtonPress;
 import com.smartdevicelink.proxy.rpc.OnHMIStatus;
 import com.smartdevicelink.proxy.rpc.Speak;
+import com.smartdevicelink.proxy.rpc.TTSChunk;
 import com.smartdevicelink.proxy.rpc.enums.AppHMIType;
 import com.smartdevicelink.proxy.rpc.enums.ButtonName;
 import com.smartdevicelink.proxy.rpc.enums.FileType;
@@ -40,6 +40,7 @@ import com.smartdevicelink.proxy.rpc.enums.InteractionMode;
 import com.smartdevicelink.proxy.rpc.enums.Language;
 import com.smartdevicelink.proxy.rpc.enums.MenuLayout;
 import com.smartdevicelink.proxy.rpc.enums.PredefinedWindows;
+import com.smartdevicelink.proxy.rpc.enums.SpeechCapabilities;
 import com.smartdevicelink.proxy.rpc.enums.TriggerSource;
 import com.smartdevicelink.proxy.rpc.listeners.OnRPCNotificationListener;
 import com.smartdevicelink.transport.BaseTransportConfig;
@@ -232,7 +233,8 @@ public class SdlService extends Service {
 							break;
 					}
 					if (isNeedUpdate) {
-						return new LifecycleConfigurationUpdate(appName, null, TTSChunkFactory.createSimpleTTSChunks(ttsName), null);
+						Vector<TTSChunk> chunks = new Vector<>(Collections.singletonList(new TTSChunk(ttsName, SpeechCapabilities.TEXT)));
+						return new LifecycleConfigurationUpdate(appName, null, chunks, null);
 					} else {
 						return null;
 					}
@@ -347,7 +349,8 @@ public class SdlService extends Service {
 	 * Will speak a sample welcome message
 	 */
 	private void performWelcomeSpeak(){
-		sdlManager.sendRPC(new Speak(TTSChunkFactory.createSimpleTTSChunks(WELCOME_SPEAK)));
+		List<TTSChunk> chunks = Collections.singletonList(new TTSChunk(WELCOME_SPEAK, SpeechCapabilities.TEXT));
+		sdlManager.sendRPC(new Speak(chunks));
 	}
 
 	/**
@@ -409,7 +412,8 @@ public class SdlService extends Service {
 		sdlManager.getScreenManager().setTextField2("");
 		sdlManager.getScreenManager().commit(null);
 
-		sdlManager.sendRPC(new Speak(TTSChunkFactory.createSimpleTTSChunks(TEST_COMMAND_NAME)));
+		List<TTSChunk> chunks = Collections.singletonList(new TTSChunk(TEST_COMMAND_NAME, SpeechCapabilities.TEXT));
+		sdlManager.sendRPC(new Speak(chunks));
 	}
 
 	private void showAlert(String text){
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/TestValues.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/TestValues.java
index 2b721db7c..16c1c9613 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/TestValues.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/TestValues.java
@@ -16,7 +16,6 @@ import com.smartdevicelink.managers.screen.menu.VoiceCommand;
 import com.smartdevicelink.managers.screen.menu.VoiceCommandSelectionListener;
 import com.smartdevicelink.protocol.SdlProtocol;
 import com.smartdevicelink.protocol.enums.FunctionID;
-import com.smartdevicelink.proxy.TTSChunkFactory;
 import com.smartdevicelink.proxy.rpc.AppInfo;
 import com.smartdevicelink.proxy.rpc.AppServiceCapability;
 import com.smartdevicelink.proxy.rpc.AppServiceData;
@@ -494,7 +493,7 @@ public class TestValues {
 	public static final List<ClimateControlCapabilities> GENERAL_CLIMATECONTROLCAPABILITIES_LIST = new ArrayList<ClimateControlCapabilities>(1);
 	public static final List<RadioControlCapabilities>   GENERAL_RADIOCONTROLCAPABILITIES_LIST   = new ArrayList<RadioControlCapabilities>(1);
 	public static final Vector<String>                   GENERAL_VECTOR_STRING                   = new Vector<>(Arrays.asList(new String[] { "a", "b"}));
-	public static final Vector<TTSChunk>                 GENERAL_VECTOR_TTS_CHUNKS               = new Vector<>(Arrays.asList(TTSChunkFactory.createChunk(SpeechCapabilities.TEXT, "Welcome to the jungle")));
+	public static final Vector<TTSChunk>                 GENERAL_VECTOR_TTS_CHUNKS               = new Vector<>(Arrays.asList(new TTSChunk("Welcome to the jungle", SpeechCapabilities.TEXT)));
 	public static final List<SeatControlCapabilities>   GENERAL_SEATCONTROLCAPABILITIES_LIST   = new ArrayList<SeatControlCapabilities>(1);
 	public static final List<EqualizerSettings>         GENERAL_EQUALIZERSETTINGS_LIST         = new ArrayList<EqualizerSettings>(1);
 	public static final List<LightCapabilities>         GENERAL_LIGHTCAPABILITIES_LIST         = new ArrayList<LightCapabilities>(1);
@@ -794,8 +793,8 @@ public class TestValues {
 		GENERAL_VRHELPITEM.setPosition(100);
     	GENERAL_VRHELPITEM_LIST.add(GENERAL_VRHELPITEM);
 
-    	GENERAL_TTSCHUNK_LIST.add(TTSChunkFactory.createChunk(SpeechCapabilities.TEXT, "Welcome to the jungle"));
-    	GENERAL_TTSCHUNK_LIST.add(TTSChunkFactory.createChunk(SpeechCapabilities.TEXT, "Say a command"));
+    	GENERAL_TTSCHUNK_LIST.add(new TTSChunk("Welcome to the jungle", SpeechCapabilities.TEXT));
+    	GENERAL_TTSCHUNK_LIST.add(new TTSChunk("Say a command", SpeechCapabilities.TEXT));
 
     	GENERAL_KEYBOARDPROPERTIES.setAutoCompleteText(GENERAL_STRING);
     	GENERAL_KEYBOARDPROPERTIES.setKeypressMode(KeypressMode.SINGLE_KEYPRESS);
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/InternalProxyMessageTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/InternalProxyMessageTests.java
deleted file mode 100644
index ec64ed99d..000000000
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/InternalProxyMessageTests.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.smartdevicelink.test.proxy;
-
-import com.smartdevicelink.proxy.callbacks.InternalProxyMessage;
-import com.smartdevicelink.test.TestValues;
-
-import junit.framework.TestCase;
-
-/**
- * This is a unit test class for the SmartDeviceLink library project class : 
- * {@link com.smartdevicelink.proxy.callbacks.InternalProxyMessage}
- */
-public class InternalProxyMessageTests extends TestCase {
-	
-	/**
-	 * This is a unit test for the following methods : 
-	 * {@link com.smartdevicelink.proxy.callbacks.InternalProxyMessage#InternalProxyMessage(String)}
-	 */
-	public void testValues () {
-		// Valid Tests
-		String test = "functionName";
-		InternalProxyMessage testIPM = new InternalProxyMessage(test);
-		assertEquals(TestValues.MATCH, test, testIPM.getFunctionName());
-		
-		test = "OnProxyError";
-		assertEquals(TestValues.MATCH, test, InternalProxyMessage.OnProxyError);
-		test = "OnProxyOpened";
-		assertEquals(TestValues.MATCH, test, InternalProxyMessage.OnProxyOpened);
-		test = "OnProxyClosed";
-		assertEquals(TestValues.MATCH, test, InternalProxyMessage.OnProxyClosed);
-		
-		// Invalid/Null Tests
-		testIPM = new InternalProxyMessage(null);
-		assertNull(TestValues.NULL, testIPM.getFunctionName());
-	}
-}
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/TTSChunkFactoryTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/TTSChunkFactoryTests.java
deleted file mode 100644
index ad1976cb1..000000000
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/proxy/TTSChunkFactoryTests.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package com.smartdevicelink.test.proxy;
-
-import com.smartdevicelink.proxy.TTSChunkFactory;
-import com.smartdevicelink.proxy.rpc.TTSChunk;
-import com.smartdevicelink.proxy.rpc.enums.SpeechCapabilities;
-import com.smartdevicelink.test.TestValues;
-
-import junit.framework.TestCase;
-
-import java.util.Vector;
-
-/**
- * This is a unit test class for the SmartDeviceLink library project class : 
- * {@link com.smartdevicelink.proxy.TTSChunkFactory}
- */
-public class TTSChunkFactoryTests extends TestCase {
-	
-	private TTSChunk testChunk;
-	
-	/**
-	 * This is a unit test for the following methods : 
-	 * {@link com.smartdevicelink.proxy.TTSChunkFactory#createChunk(SpeechCapabilities, String)}
-	 */
-	public void testCreateChunk () {
-		// Valid Tests
-		SpeechCapabilities testType = SpeechCapabilities.TEXT;
-		testChunk = TTSChunkFactory.createChunk(testType, TestValues.GENERAL_STRING);
-		assertNotNull(TestValues.NOT_NULL, testChunk);
-		assertEquals(TestValues.MATCH, testType, testChunk.getType());
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testChunk.getText());
-		
-		testType = SpeechCapabilities.SILENCE;
-		testChunk = TTSChunkFactory.createChunk(testType, TestValues.GENERAL_STRING);
-		assertNotNull(TestValues.NOT_NULL, testChunk);
-		assertEquals(TestValues.MATCH, testType, testChunk.getType());
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testChunk.getText());
-				
-		testType = SpeechCapabilities.SAPI_PHONEMES;
-		testChunk = TTSChunkFactory.createChunk(testType, TestValues.GENERAL_STRING);
-		assertNotNull(TestValues.NOT_NULL, testChunk);
-		assertEquals(TestValues.MATCH, testType, testChunk.getType());
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testChunk.getText());
-		
-		testType = SpeechCapabilities.PRE_RECORDED;
-		testChunk = TTSChunkFactory.createChunk(testType, TestValues.GENERAL_STRING);
-		assertNotNull(TestValues.NOT_NULL, testChunk);
-		assertEquals(TestValues.MATCH, testType, testChunk.getType());
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testChunk.getText());
-		
-		testType = SpeechCapabilities.LHPLUS_PHONEMES;
-		testChunk = TTSChunkFactory.createChunk(testType, TestValues.GENERAL_STRING);
-		assertNotNull(TestValues.NOT_NULL, testChunk);
-		assertEquals(TestValues.MATCH, testType, testChunk.getType());
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testChunk.getText());
-		
-		// Invalid/Null Tests
-		testChunk = TTSChunkFactory.createChunk(null, null);
-		assertNotNull(TestValues.NOT_NULL, testChunk);
-		assertNull(TestValues.NULL, testChunk.getType());
-		assertNull(TestValues.NULL, testChunk.getText());
-	}
-	
-	/**
-	 * This is a unit test for the following methods : 
-	 * {@link com.smartdevicelink.proxy.TTSChunkFactory#createSimpleTTSChunks(String)}
-	 */
-	public void testCreateSimpleTTSChunks () {
-		// Test Values
-		Vector<TTSChunk> testChunks;
-		testChunks = TTSChunkFactory.createSimpleTTSChunks(TestValues.GENERAL_STRING);
-		
-		// Valid Tests
-		assertNotNull(TestValues.NOT_NULL, testChunks);
-		assertEquals(TestValues.MATCH, SpeechCapabilities.TEXT, testChunks.get(0).getType());
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testChunks.get(0).getText());
-		
-		// Invalid/Null Tests
-		testChunks = TTSChunkFactory.createSimpleTTSChunks(null);
-		assertNull(TestValues.NULL, testChunks);
-	}
-
-	/**
-	 * This is a unit test for the following methods : 
-	 * {@link com.smartdevicelink.proxy.TTSChunkFactory#createPrerecordedTTSChunks(String)}
-	 */
-	public void testCreatePrerecordedTTSChunks () {
-		// Test Values
-		Vector<TTSChunk> testChunks;
-		testChunks = TTSChunkFactory.createPrerecordedTTSChunks(TestValues.GENERAL_STRING);
-		
-		// Valid Tests
-		assertNotNull(TestValues.NOT_NULL, testChunks);
-		assertEquals(TestValues.MATCH, SpeechCapabilities.PRE_RECORDED, testChunks.get(0).getType());
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testChunks.get(0).getText());
-		
-		// Invalid/Null Tests
-		testChunks = TTSChunkFactory.createPrerecordedTTSChunks(null);
-		assertNull(TestValues.NULL, testChunks);
-	}
-}
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnErrorTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnErrorTests.java
deleted file mode 100644
index f0c542894..000000000
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnErrorTests.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.smartdevicelink.test.rpc.notifications;
-
-import com.smartdevicelink.proxy.callbacks.InternalProxyMessage;
-import com.smartdevicelink.proxy.callbacks.OnError;
-import com.smartdevicelink.test.TestValues;
-
-import junit.framework.TestCase;
-
-import org.junit.Test;
-
-/**
- * This is a unit test class for the SmartDeviceLink library project class : 
- * {@link com.smartdevicelink.proxy.callbacks.OnError}
- */
-public class OnErrorTests extends TestCase {
-		
-	/**
-	 * This is a unit test for the following methods : 
-	 * {@link com.smartdevicelink.proxy.callbacks.OnError#OnError()}
-	 * {@link com.smartdevicelink.proxy.callbacks.OnError#OnError(String, Exception)}
-	 */
-	@Test
-	public void testValues () {		
-		// Valid Tests
-		OnError testOnError = new OnError();
-		assertEquals(TestValues.MATCH, InternalProxyMessage.OnProxyError, testOnError.getFunctionName());
-		
-		Exception testE = new Exception();
-		testOnError = new OnError(TestValues.GENERAL_STRING, testE);
-		assertEquals(TestValues.MATCH, InternalProxyMessage.OnProxyError, testOnError.getFunctionName());
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testOnError.getInfo());
-		assertEquals(TestValues.MATCH, testE, testOnError.getException());
-		
-		// Invalid/Null Tests
-		testOnError = new OnError(null, null);
-		assertEquals(TestValues.MATCH, InternalProxyMessage.OnProxyError, testOnError.getFunctionName());
-		assertNull(TestValues.NULL, testOnError.getInfo());
-		assertNull(TestValues.NULL, testOnError.getException());
-	}
-}
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnProxyClosedTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnProxyClosedTests.java
deleted file mode 100644
index 1ef639029..000000000
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnProxyClosedTests.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.smartdevicelink.test.rpc.notifications;
-
-import com.smartdevicelink.proxy.callbacks.InternalProxyMessage;
-import com.smartdevicelink.proxy.callbacks.OnProxyClosed;
-import com.smartdevicelink.proxy.rpc.enums.SdlDisconnectedReason;
-import com.smartdevicelink.test.TestValues;
-
-import junit.framework.TestCase;
-
-import org.junit.Test;
-
-/**
- * This is a unit test class for the SmartDeviceLink library project class : 
- * {@link com.smartdevicelink.proxy.callbacks.OnProxyClosed}
- */
-public class OnProxyClosedTests extends TestCase {
-	
-	/**
-	 * This is a unit test for the following methods : 
-	 * {@link com.smartdevicelink.proxy.callbacks.OnProxyClosed#OnProxyClosed()}
-	 * {@link com.smartdevicelink.proxy.callbacks.OnProxyClosed#OnProxyClosed(String, Exception, SdlDisconnectedReason)}
-	 */
-	@Test
-	public void testValues () {
-		// Valid Tests
-		OnProxyClosed testOnProxyClosed = new OnProxyClosed();
-		assertEquals(TestValues.MATCH, InternalProxyMessage.OnProxyClosed, testOnProxyClosed.getFunctionName());
-		
-		Exception testE = new Exception();
-		SdlDisconnectedReason testReason = SdlDisconnectedReason.DEFAULT;
-		testOnProxyClosed = new OnProxyClosed(TestValues.GENERAL_STRING, testE, testReason);
-		assertEquals(TestValues.MATCH, InternalProxyMessage.OnProxyClosed, testOnProxyClosed.getFunctionName());
-		assertEquals(TestValues.MATCH, TestValues.GENERAL_STRING, testOnProxyClosed.getInfo());
-		assertEquals(TestValues.MATCH, testE, testOnProxyClosed.getException());
-		assertEquals(TestValues.MATCH, testReason, testOnProxyClosed.getReason());
-		
-		// Invalid/Null Tests
-		testOnProxyClosed = new OnProxyClosed(null, null, null);
-		assertEquals(TestValues.MATCH, InternalProxyMessage.OnProxyClosed, testOnProxyClosed.getFunctionName());
-		assertNull(TestValues.NULL, testOnProxyClosed.getInfo());
-		assertNull(TestValues.NULL, testOnProxyClosed.getException());
-		assertNull(TestValues.NULL, testOnProxyClosed.getReason());
-	}
-}
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnProxyOpenedTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnProxyOpenedTests.java
deleted file mode 100644
index 3f76fd4cb..000000000
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/rpc/notifications/OnProxyOpenedTests.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package com.smartdevicelink.test.rpc.notifications;
-
-import com.smartdevicelink.proxy.callbacks.InternalProxyMessage;
-import com.smartdevicelink.proxy.callbacks.OnProxyOpened;
-import com.smartdevicelink.test.TestValues;
-
-import junit.framework.TestCase;
-
-import org.junit.Test;
-
-/**
- * This is a unit test class for the SmartDeviceLink library project class : 
- * {@link com.smartdevicelink.proxy.callbacks.OnProxyOpened}
- */
-public class OnProxyOpenedTests extends TestCase {
-	
-
-	/**
-	 * This is a unit test for the following methods : 
-	 * {@link com.smartdevicelink.proxy.callbacks.OnProxyOpened#OnProxyOpened()}
-	 * {@link com.smartdevicelink.proxy.callbacks.OnProxyOpened#getFunctionName()}
-	 */
-	@Test
-	public void testMethods () {		
-		OnProxyOpened testOnProxyOpened = new OnProxyOpened();
-		assertNotNull(TestValues.NOT_NULL, testOnProxyOpened);
-		assertEquals(TestValues.MATCH, InternalProxyMessage.OnProxyOpened, testOnProxyOpened.getFunctionName());
-	}
-}
\ No newline at end of file
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/BaseTransportConfigTests.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/BaseTransportConfigTests.java
index d5f6629bd..8fcde0456 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/BaseTransportConfigTests.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/BaseTransportConfigTests.java
@@ -15,7 +15,6 @@ public class BaseTransportConfigTests extends TestCase {
 	/**
 	 * This is a unit test for the following methods : 
 	 * {@link com.smartdevicelink.transport.BaseTransportConfig#getTransportType()}
-	 * {@link com.smartdevicelink.transport.BaseTransportConfig#shareConnection()}
 	 * {@link com.smartdevicelink.transport.BaseTransportConfig#getHeartBeatTimeout()}
 	 * {@link com.smartdevicelink.transport.BaseTransportConfig#setHeartBeatTimeout(int)}
 	 */
@@ -27,14 +26,12 @@ public class BaseTransportConfigTests extends TestCase {
 		
 		// Comparison Values
 		int     expectedMaxValue      = Integer.MAX_VALUE;
-		boolean actualShareConnection = testBaseTransportConfig.shareConnection();
 		int     actualMaxValue        = testBaseTransportConfig.getHeartBeatTimeout();
 		
 		// Valid Tests
 		assertNotNull(TestValues.NOT_NULL, testBaseTransportConfig);
 		assertEquals(TestValues.MATCH, expectedMaxValue, actualMaxValue);
-		assertTrue(TestValues.TRUE, actualShareConnection);
-		
+
 		testBaseTransportConfig.setHeartBeatTimeout(testInt);
 		assertEquals(TestValues.MATCH, testInt, testBaseTransportConfig.getHeartBeatTimeout());
 	}
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/MultiplexBluetoothTransportTest.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/MultiplexBluetoothTransportTest.java
index cdf83079c..51916ea16 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/MultiplexBluetoothTransportTest.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/test/transport/MultiplexBluetoothTransportTest.java
@@ -47,11 +47,7 @@ public class MultiplexBluetoothTransportTest extends TestCase {
 
 		};
 
-		//TODO test for more than the two states
-		bluetooth = MultiplexBluetoothTransport.getBluetoothSerialServerInstance();
-		assertNull(bluetooth);
-
-		bluetooth = MultiplexBluetoothTransport.getBluetoothSerialServerInstance(stateChangeHandler);
+		bluetooth = new MultiplexBluetoothTransport(stateChangeHandler);
 		assertEquals(bluetooth.getState(), MultiplexBluetoothTransport.STATE_NONE);
 
 		bluetooth.start();
diff --git a/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/RSVTestCase.java b/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/RSVTestCase.java
index 91aea6432..557e0592d 100644
--- a/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/RSVTestCase.java
+++ b/android/sdl_android/src/androidTest/java/com/smartdevicelink/transport/RSVTestCase.java
@@ -371,7 +371,7 @@ public class RSVTestCase {
 			}
 		};
 		
-		assertTrue(RouterServiceValidator.createTrustedListRequest(getInstrumentation().getTargetContext(),true, cb));
+		assertTrue(RouterServiceValidator.createTrustedListRequest(getInstrumentation().getTargetContext(),true, cb, null));
 		//Now wait for call to finish
 		synchronized(REQUEST_LOCK){
 			try {
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java b/android/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java
deleted file mode 100644
index e69de29bb..000000000
--- a/android/sdl_android/src/main/java/com/smartdevicelink/proxy/SdlProxyBase.java
+++ /dev/null
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexBaseTransport.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexBaseTransport.java
index 10c1c9880..e1f138978 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexBaseTransport.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexBaseTransport.java
@@ -61,8 +61,6 @@ public abstract class MultiplexBaseTransport {
     protected final TransportType transportType;
 
     protected TransportRecord transportRecord;
-    @Deprecated
-    public static String currentlyConnectedDevice = null;
     protected String connectedDeviceName = null;
     public String connectedDeviceAddress = null;
 
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexBluetoothTransport.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexBluetoothTransport.java
index 01251f61f..138b1adb2 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexBluetoothTransport.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/MultiplexBluetoothTransport.java
@@ -89,41 +89,6 @@ public class MultiplexBluetoothTransport extends MultiplexBaseTransport{
         mBluetoothLevel = SdlRouterService.getBluetoothPrefs(SHARED_PREFS);
     }
 
-
-    /**
-     * This method has been deprecated. It will return an instance of MultiplexBluetoothTransport but <b>should not</b> be used.
-     * @param handler for receiving status messages from the transport
-     * @return an instance of MultiplexBluetoothTransport
-     * @deprecated
-     */
-	@Deprecated
-    public synchronized static MultiplexBluetoothTransport getBluetoothSerialServerInstance(Handler handler){
-    	return new MultiplexBluetoothTransport(handler);
-    }
-    /**
-     * This method has been deprecated. It will return an instance of MultiplexBluetoothTransport but <b>should not</b> be used.
-     * @param handler for receiving status messages from the transport
-     * @param keepSocketAlive Flag for keeping the socket alive
-     * @return an instance of MultiplexBluetoothTransport
-     * @deprecated
-     */
-	@Deprecated
-    public synchronized static MultiplexBluetoothTransport getBluetoothSerialServerInstance(Handler handler, boolean keepSocketAlive){
-        MultiplexBluetoothTransport transport = new MultiplexBluetoothTransport(handler);
-        transport.setKeepSocketAlive(keepSocketAlive);
-    	return transport;
-    }
-
-    /**
-     * This method has been deprecated. <b>It will always return null.</b>
-     * @return always null
-     * @deprecated
-     */
-    @Deprecated
-    public synchronized static MultiplexBluetoothTransport getBluetoothSerialServerInstance(){
-    	return null;
-    }
-
     //These methods are used so we can have a semi-static reference to the Accept Thread (Static reference inherited by housing class)
     private synchronized AcceptThread getAcceptThread(){
     	return mSecureAcceptThread;
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/transport/RouterServiceValidator.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/RouterServiceValidator.java
index f86caa699..0cc4cf853 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/transport/RouterServiceValidator.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/RouterServiceValidator.java
@@ -638,11 +638,6 @@ public class RouterServiceValidator {
 		return createTrustedListRequest(context,forceRefresh,null,listCallback);
 	}
 	
-	@Deprecated
-	protected static boolean createTrustedListRequest(final Context context, boolean forceRefresh,HttpRequestTask.HttpRequestTaskCallback cb ){
-		return createTrustedListRequest(context,forceRefresh,cb,null);
-	}
-	
 	protected static boolean createTrustedListRequest(final Context context, boolean forceRefresh,HttpRequestTask.HttpRequestTaskCallback cb, final TrustedListCallback listCallback ){
 		if(context == null){
 			return false;
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/transport/SdlBroadcastReceiver.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/SdlBroadcastReceiver.java
index 62a4b682c..7d7a3d676 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/transport/SdlBroadcastReceiver.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/SdlBroadcastReceiver.java
@@ -462,11 +462,6 @@ public abstract class SdlBroadcastReceiver extends BroadcastReceiver{
 	 * @param context A context to access Android system services through. If null is passed, this will always return false
 	 * @param callback Use this callback to find out if the router service is connected or not. 
 	 */
-	@Deprecated
-	public static void requestTransportStatus(Context context, final SdlRouterStatusProvider.ConnectedStatusCallback callback){
-		requestTransportStatus(context,callback,false, true);
-	}
-
 	private static void requestTransportStatus(Context context, final SdlRouterStatusProvider.ConnectedStatusCallback callback, final boolean triggerRouterServicePing, final boolean lookForServices){
 		if(context == null){
 			if(callback!=null){
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/transport/TransportBroker.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/TransportBroker.java
index acf84462f..3851ab563 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/transport/TransportBroker.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/TransportBroker.java
@@ -752,11 +752,6 @@ public class TransportBroker {
     /**
      * Use this method to let the router service know that you are requesting a new session from the head unit.
      */
-    @Deprecated
-    public void requestNewSession() {
-        requestNewSession(null);
-    }
-
     public void requestNewSession(TransportRecord transportRecord) {
         Message msg = Message.obtain();
         msg.what = TransportConstants.ROUTER_REQUEST_NEW_SESSION;
diff --git a/android/sdl_android/src/main/java/com/smartdevicelink/transport/utl/ByteArrayMessageSpliter.java b/android/sdl_android/src/main/java/com/smartdevicelink/transport/utl/ByteArrayMessageSpliter.java
index c7333fb08..9ab93aea9 100644
--- a/android/sdl_android/src/main/java/com/smartdevicelink/transport/utl/ByteArrayMessageSpliter.java
+++ b/android/sdl_android/src/main/java/com/smartdevicelink/transport/utl/ByteArrayMessageSpliter.java
@@ -68,17 +68,6 @@ public class ByteArrayMessageSpliter {
 		this.priorityCoef = priorityCoef;
 	}
 	
-	@Deprecated
-	public ByteArrayMessageSpliter(Long appId,int what, byte[] bytes, int priorityCoef){
-		this.appId = appId+"";
-		this.what = what;
-		stream = new ByteArrayInputStream(bytes);
-		orginalSize  = stream.available();
-		bytesRead = 0; 
-		firstPacket = true;
-		this.priorityCoef = priorityCoef;
-	}
-	
 	public void setRouterServiceVersion(int version){
 		this.routerServiceVersion = version;
 	}
diff --git a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/ChoiceSet.java b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/ChoiceSet.java
index 6585ad810..c85333cbe 100644
--- a/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/ChoiceSet.java
+++ b/base/src/main/java/com/smartdevicelink/managers/screen/choiceset/ChoiceSet.java
@@ -35,13 +35,14 @@ package com.smartdevicelink.managers.screen.choiceset;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import com.smartdevicelink.proxy.TTSChunkFactory;
 import com.smartdevicelink.proxy.rpc.KeyboardProperties;
 import com.smartdevicelink.proxy.rpc.TTSChunk;
 import com.smartdevicelink.proxy.rpc.VrHelpItem;
+import com.smartdevicelink.proxy.rpc.enums.SpeechCapabilities;
 import com.smartdevicelink.util.DebugTool;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Hashtable;
 import java.util.List;
 
@@ -108,15 +109,15 @@ public class ChoiceSet {
 
         // Help the dev by creating TTS chunks for them
         if (initialPrompt != null){
-            setInitialPrompt(TTSChunkFactory.createSimpleTTSChunks(initialPrompt));
+            setInitialPrompt(Collections.singletonList(new TTSChunk(initialPrompt, SpeechCapabilities.TEXT)));
         }
 
         if (timeoutPrompt != null){
-            setTimeoutPrompt(TTSChunkFactory.createSimpleTTSChunks(timeoutPrompt));
+            setTimeoutPrompt(Collections.singletonList(new TTSChunk(timeoutPrompt, SpeechCapabilities.TEXT)));
         }
 
         if (helpPrompt != null){
-            setHelpPrompt(TTSChunkFactory.createSimpleTTSChunks(helpPrompt));
+            setHelpPrompt(Collections.singletonList(new TTSChunk(helpPrompt, SpeechCapabilities.TEXT)));
         }
 
         // things to do
@@ -397,5 +398,4 @@ public class ChoiceSet {
         }
         return clonedHelpItems;
     }
-
 }
diff --git a/base/src/main/java/com/smartdevicelink/proxy/RPCStruct.java b/base/src/main/java/com/smartdevicelink/proxy/RPCStruct.java
index 402866291..cebe43a60 100644
--- a/base/src/main/java/com/smartdevicelink/proxy/RPCStruct.java
+++ b/base/src/main/java/com/smartdevicelink/proxy/RPCStruct.java
@@ -91,19 +91,11 @@ public class RPCStruct {
 		store = JsonRPCMarshaller.deserializeJSONObject(jsonObject);

 

 	}

-	

-	// deserializeJSONObject method moved to JsonRPCMarshaller for consistency

-	// Keep reference here for backwards compatibility

-	@Deprecated

-	public static Hashtable<String, Object> deserializeJSONObject(JSONObject jsonObject) 

-			throws JSONException {

-		return JsonRPCMarshaller.deserializeJSONObject(jsonObject);

-	}

 

 	public JSONObject serializeJSON() throws JSONException {

 		return JsonRPCMarshaller.serializeHashtable(store);

 	}

-	

+

 	@SuppressWarnings("unchecked")

     public JSONObject serializeJSON(byte protocolVersion) throws JSONException {

 		if (protocolVersion > 1) {

diff --git a/base/src/main/java/com/smartdevicelink/proxy/TTSChunkFactory.java b/base/src/main/java/com/smartdevicelink/proxy/TTSChunkFactory.java
deleted file mode 100644
index d338a8f19..000000000
--- a/base/src/main/java/com/smartdevicelink/proxy/TTSChunkFactory.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*

- * Copyright (c) 2017 - 2019, SmartDeviceLink Consortium, Inc.

- * All rights reserved.

- *

- * Redistribution and use in source and binary forms, with or without

- * modification, are permitted provided that the following conditions are met:

- *

- * Redistributions of source code must retain the above copyright notice, this

- * list of conditions and the following disclaimer.

- *

- * Redistributions in binary form must reproduce the above copyright notice,

- * this list of conditions and the following

- * disclaimer in the documentation and/or other materials provided with the

- * distribution.

- *

- * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its

- * contributors may be used to endorse or promote products derived from this 

- * software without specific prior written permission.

- *

- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"

- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE

- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR

- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF

- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS

- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN

- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE

- * POSSIBILITY OF SUCH DAMAGE.

- */

-package com.smartdevicelink.proxy;

-

-import com.smartdevicelink.proxy.rpc.TTSChunk;

-import com.smartdevicelink.proxy.rpc.enums.SpeechCapabilities;

-

-import java.util.Vector;

-

-@Deprecated

-public class TTSChunkFactory {

-

-	public static TTSChunk createChunk(SpeechCapabilities type, String text) {

-		TTSChunk ret = new TTSChunk();

-		ret.setType(type);

-		ret.setText(text);

-		return ret;

-	}

-

-	public static Vector<TTSChunk> createSimpleTTSChunks(String simple) {

-		if (simple == null) {

-			return null;

-		}

-		

-		Vector<TTSChunk> chunks = new Vector<TTSChunk>();

-		

-		TTSChunk chunk = createChunk(SpeechCapabilities.TEXT, simple);

-		chunks.add(chunk);

-		return chunks;

-	}

-

-	public static Vector<TTSChunk> createPrerecordedTTSChunks(String prerecorded) {

-		if (prerecorded == null) {

-			return null;

-		}

-		

-		Vector<TTSChunk> chunks = new Vector<TTSChunk>();

-		TTSChunk chunk = createChunk(SpeechCapabilities.PRE_RECORDED, prerecorded);

-		chunks.add(chunk);

-		return chunks;

-	}

-}

diff --git a/base/src/main/java/com/smartdevicelink/proxy/callbacks/InternalProxyMessage.java b/base/src/main/java/com/smartdevicelink/proxy/callbacks/InternalProxyMessage.java
deleted file mode 100644
index f05e3d49f..000000000
--- a/base/src/main/java/com/smartdevicelink/proxy/callbacks/InternalProxyMessage.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 2017 - 2019, SmartDeviceLink Consortium, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from this 
- * software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-package com.smartdevicelink.proxy.callbacks;
-
-@Deprecated
-public class InternalProxyMessage {
-	private String _functionName;
-	public static final String OnProxyError = "OnProxyError";
-	public static final String OnProxyOpened = "OnProxyOpened";
-	public static final String OnProxyClosed = "OnProxyClosed";
-	public static final String OnServiceEnded = "OnServiceEnded";
-	public static final String OnServiceNACKed = "OnServiceNACKed";	
-	
-	public InternalProxyMessage(String functionName) {
-		//this(functionName, null, null);
-		this._functionName = functionName;
-	}
-	
-	public String getFunctionName() {
-		return _functionName;
-	}
-}
\ No newline at end of file
diff --git a/base/src/main/java/com/smartdevicelink/proxy/callbacks/OnError.java b/base/src/main/java/com/smartdevicelink/proxy/callbacks/OnError.java
deleted file mode 100644
index 3992f4a31..000000000
--- a/base/src/main/java/com/smartdevicelink/proxy/callbacks/OnError.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 2017 - 2019, SmartDeviceLink Consortium, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from this 
- * software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-package com.smartdevicelink.proxy.callbacks;
-
-@Deprecated
-public class OnError extends InternalProxyMessage {
-
-	private String _info;
-	private Exception _e;
-	
-	public OnError() {
-		super(InternalProxyMessage.OnProxyError);
-	}
-
-	public OnError(String info, Exception e) {
-		super(InternalProxyMessage.OnProxyError);
-		this._info = info;
-		this._e = e;
-	}
-	
-	public String getInfo() {
-		return _info;
-	}
-	
-	public Exception getException() {
-		return _e;
-	}
-}
\ No newline at end of file
diff --git a/base/src/main/java/com/smartdevicelink/proxy/callbacks/OnProxyClosed.java b/base/src/main/java/com/smartdevicelink/proxy/callbacks/OnProxyClosed.java
deleted file mode 100644
index 27c621a07..000000000
--- a/base/src/main/java/com/smartdevicelink/proxy/callbacks/OnProxyClosed.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*

- * Copyright (c) 2017 - 2019, SmartDeviceLink Consortium, Inc.

- * All rights reserved.

- *

- * Redistribution and use in source and binary forms, with or without

- * modification, are permitted provided that the following conditions are met:

- *

- * Redistributions of source code must retain the above copyright notice, this

- * list of conditions and the following disclaimer.

- *

- * Redistributions in binary form must reproduce the above copyright notice,

- * this list of conditions and the following

- * disclaimer in the documentation and/or other materials provided with the

- * distribution.

- *

- * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its

- * contributors may be used to endorse or promote products derived from this 

- * software without specific prior written permission.

- *

- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"

- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE

- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR

- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF

- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS

- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN

- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE

- * POSSIBILITY OF SUCH DAMAGE.

- */

-package com.smartdevicelink.proxy.callbacks;

-

-import com.smartdevicelink.proxy.rpc.enums.SdlDisconnectedReason;

-

-@Deprecated

-public class OnProxyClosed extends InternalProxyMessage {

-	

-	private String _info;

-	private Exception _e;

-	private SdlDisconnectedReason _reason;

-	

-	public OnProxyClosed() {

-		super(InternalProxyMessage.OnProxyClosed);

-	}

-	

-	public OnProxyClosed(String info, Exception e, SdlDisconnectedReason reason) {

-		super(InternalProxyMessage.OnProxyClosed);

-		this._info = info;

-		this._e = e;

-		this._reason = reason;

-	}

-

-	public String getInfo() {

-		return _info;

-	}

-

-	public SdlDisconnectedReason getReason() {

-		return _reason;

-	}	

-	

-	public Exception getException() {

-		return _e;

-	}

-}
\ No newline at end of file
diff --git a/base/src/main/java/com/smartdevicelink/proxy/callbacks/OnProxyOpened.java b/base/src/main/java/com/smartdevicelink/proxy/callbacks/OnProxyOpened.java
deleted file mode 100644
index f56eff415..000000000
--- a/base/src/main/java/com/smartdevicelink/proxy/callbacks/OnProxyOpened.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2017 - 2019, SmartDeviceLink Consortium, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from this 
- * software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-package com.smartdevicelink.proxy.callbacks;
-
-@Deprecated
-public class OnProxyOpened extends InternalProxyMessage {
-
-	public OnProxyOpened() {
-		super(InternalProxyMessage.OnProxyOpened);
-	}
-}
diff --git a/base/src/main/java/com/smartdevicelink/proxy/callbacks/OnServiceEnded.java b/base/src/main/java/com/smartdevicelink/proxy/callbacks/OnServiceEnded.java
deleted file mode 100644
index cad213ca8..000000000
--- a/base/src/main/java/com/smartdevicelink/proxy/callbacks/OnServiceEnded.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2017 - 2019, SmartDeviceLink Consortium, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from this 
- * software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-package com.smartdevicelink.proxy.callbacks;
-
-import com.smartdevicelink.protocol.enums.SessionType;
-
-@Deprecated
-public class OnServiceEnded extends InternalProxyMessage {
-	private SessionType sessionType;
-
-	public OnServiceEnded() {
-		super(InternalProxyMessage.OnServiceEnded);
-	}
-
-	public OnServiceEnded(SessionType sessionType) {
-		super(InternalProxyMessage.OnServiceEnded);
-		this.sessionType = sessionType;
-	}
-
-	public SessionType getSessionType() {
-		return this.sessionType;
-	}
-
-}
diff --git a/base/src/main/java/com/smartdevicelink/proxy/callbacks/OnServiceNACKed.java b/base/src/main/java/com/smartdevicelink/proxy/callbacks/OnServiceNACKed.java
deleted file mode 100644
index 6f719f615..000000000
--- a/base/src/main/java/com/smartdevicelink/proxy/callbacks/OnServiceNACKed.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2017 - 2019, SmartDeviceLink Consortium, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from this 
- * software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-package com.smartdevicelink.proxy.callbacks;
-
-import com.smartdevicelink.protocol.enums.SessionType;
-
-@Deprecated
-public class OnServiceNACKed extends InternalProxyMessage {
-	private SessionType sessionType;
-
-	public OnServiceNACKed() {
-		super(InternalProxyMessage.OnServiceNACKed);
-	}
-
-	public OnServiceNACKed(SessionType sessionType) {
-		super(InternalProxyMessage.OnServiceNACKed);
-		this.sessionType = sessionType;
-	}
-
-	public SessionType getSessionType() {
-		return this.sessionType;
-	}
-
-}
diff --git a/base/src/main/java/com/smartdevicelink/proxy/constants/Jingles.java b/base/src/main/java/com/smartdevicelink/proxy/constants/Jingles.java
deleted file mode 100644
index 73f7adeeb..000000000
--- a/base/src/main/java/com/smartdevicelink/proxy/constants/Jingles.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2017 - 2019, SmartDeviceLink Consortium, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from this 
- * software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-package com.smartdevicelink.proxy.constants;

-

-@Deprecated

-public class Jingles {

-	public static final String POSITIVE_JINGLE = "POSITIVE_JINGLE";

-

-	public static final String NEGATIVE_JINGLE = "NEGATIVE_JINGLE";

-

-	public static final String INITIAL_JINGLE = "INITIAL_JINGLE";

-

-	public static final String LISTEN_JINGLE = "LISTEN_JINGLE";

-

-	public static final String HELP_JINGLE = "HELP_JINGLE";

-

-}
\ No newline at end of file
diff --git a/base/src/main/java/com/smartdevicelink/proxy/constants/Names.java b/base/src/main/java/com/smartdevicelink/proxy/constants/Names.java
deleted file mode 100644
index fe63db715..000000000
--- a/base/src/main/java/com/smartdevicelink/proxy/constants/Names.java
+++ /dev/null
@@ -1,537 +0,0 @@
-/*
- * Copyright (c) 2017 - 2019, SmartDeviceLink Consortium, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from this 
- * software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-package com.smartdevicelink.proxy.constants;

-

-@Deprecated

-public class Names {

-	public static final String request = "request";

-	public static final String response = "response";

-	public static final String notification = "notification";

-	public static final String function_name = "name";

-	public static final String parameters = "parameters";

-	public static final String bulkData = "bulkData";

-

-	public static final String RegisterAppInterface = "RegisterAppInterface";

-	public static final String UnregisterAppInterface = "UnregisterAppInterface";

-	public static final String Alert = "Alert";

-	public static final String Show = "Show";

-	public static final String Speak = "Speak";

-	public static final String AddCommand = "AddCommand";

-	public static final String DeleteCommand = "DeleteCommand";

-	public static final String AddSubMenu = "AddSubMenu";

-	public static final String DeleteSubMenu = "DeleteSubMenu";

-	public static final String CreateInteractionChoiceSet = "CreateInteractionChoiceSet";

-	public static final String DeleteInteractionChoiceSet = "DeleteInteractionChoiceSet";

-	public static final String PerformInteraction = "PerformInteraction";

-	public static final String DialNumber = "DialNumber";

-	public static final String EncodedSyncPData = "EncodedSyncPData";

-	public static final String SyncPData = "SyncPData";

-	public static final String SubscribeButton = "SubscribeButton";

-	public static final String UnsubscribeButton = "UnsubscribeButton";

-	public static final String SubscribeVehicleData = "SubscribeVehicleData";

-	public static final String UnsubscribeVehicleData = "UnsubscribeVehicleData";

-	public static final String SetMediaClockTimer = "SetMediaClockTimer";

-	public static final String SetGlobalProperties = "SetGlobalProperties";

-	public static final String GenericResponse = "GenericResponse";

-	public static final String ScrollableMessage = "ScrollableMessage";

-	public static final String GetDID = "GetDID";

-	public static final String GetDTCs = "GetDTCs";

-	public static final String DiagnosticMessage = "DiagnosticMessage";

-	public static final String SystemRequest = "SystemRequest";

-	public static final String ReadDID = "ReadDID";

-	public static final String OnVehicleData = "OnVehicleData";

-	public static final String GetFile = "GetFile";

-	public static final String PutFile = "PutFile";

-	public static final String DeleteFile = "DeleteFile";

-	public static final String ListFiles = "ListFiles";

-	public static final String EndAudioCapture = "EndAudioCapture";

-	public static final String GetVehicleData = "GetVehicleData";

-	public static final String ResetGlobalProperties = "ResetGlobalProperties";

-	public static final String PerformAudioCapture = "PerformAudioCapture";

-	public static final String SetAppIcon = "SetAppIcon";

-	public static final String ChangeRegistration = "ChangeRegistration";

-	public static final String SetDisplayLayout = "SetDisplayLayout";	

-	public static final String keypressMode = "keypressMode";

-	public static final String keyboardLayout = "keyboardLayout";

-	public static final String limitedCharacterList = "limitedCharacterList";

-	public static final String autoCompleteText = "autoCompleteText";

-	public static final String OnLanguageChange = "OnLanguageChange";	

-	public static final String hmiDisplayLanguage = "hmiDisplayLanguage";

-	public static final String displayLayout = "displayLayout";

-	public static final String ttsName = "ttsName";

-	public static final String hmiDisplayLanguageDesired = "hmiDisplayLanguageDesired";

-	public static final String appHMIType = "appHMIType";

-	public static final String hashID = "hashID";

-	public static final String appID = "appID";

-	public static final String vrHelpTitle = "vrHelpTitle";

-	public static final String graphic = "graphic";

-	public static final String customPresets = "customPresets";

-	public static final String softButtonCapabilities = "softButtonCapabilities";

-	public static final String presetBankCapabilities = "presetBankCapabilities";

-	public static final String vehicleType = "vehicleType";

-	public static final String make = "make";

-	public static final String model = "model";

-	public static final String modelYear = "modelYear";

-	public static final String trim = "trim";

-	public static final String allowed = "allowed";

-	public static final String userDisallowed = "userDisallowed";

-	public static final String rpcName = "rpcName";

-	public static final String hmiPermissions = "hmiPermissions";

-	public static final String parameterPermissions = "parameterPermissions";

-	public static final String permissionItem = "permissionItem";

-	public static final String numTicks = "numTicks";

-	public static final String sliderHeader = "sliderHeader";

-	public static final String sliderFooter = "sliderFooter";

-	public static final String PerformAudioPassThru = "PerformAudioPassThru";

-	public static final String PerformAudioPassThruResponse = "PerformAudioPassThruResponse";

-	public static final String EndAudioPassThru = "EndAudioPassThru";

-	public static final String EndAudioPassThruResponse = "EndAudioPassThruResponse";

-	public static final String OnAudioPassThru = "OnAudioPassThru";

-	public static final String ShowConstantTBT = "ShowConstantTBT";

-	public static final String AlertManeuver = "AlertManeuver";

-	public static final String UpdateTurnList = "UpdateTurnList";

-	

-	public static final String OnCommand = "OnCommand";

-	public static final String OnDataPublished = "OnDataPublished";

-	public static final String OnButtonPress = "OnButtonPress";

-	public static final String OnButtonEvent = "OnButtonEvent";

-	public static final String OnHMIStatus = "OnHMIStatus";

-	public static final String OnTBTClientState = "OnTBTClientState";

-	public static final String OnEncodedSyncPData = "OnEncodedSyncPData";

-	public static final String onEncodedSyncPDataResponse = "onEncodedSyncPDataResponse";

-	public static final String OnSyncPData = "OnSyncPData";

-	public static final String onOnSyncPData = "onOnSyncPData";

-	public static final String OnDriverDistraction = "OnDriverDistraction";

-	public static final String OnAppInterfaceUnregistered = "OnAppInterfaceUnregistered";

-	public static final String OnKeyboardInput = "OnKeyboardInput";

-	public static final String OnTouchEvent = "OnTouchEvent";

-	public static final String OnSystemRequest = "OnSystemRequest";

-	public static final String OnHashChange = "OnHashChange";

-	public static final String OnProxyClosed = "OnProxyClosed";

-	public static final String OnProxyError = "OnProxyError";

-	public static final String OnProxyOpened = "OnProxyOpened";

-	public static final String OnProxyUnusable = "OnProxyUnusable";

-	public static final String OnHMILevelChange = "OnHMILevelChange";

-	public static final String OnSdlChoiceChosen = "OnSdlChoiceChosen";

-	public static final String OnPermissionsChange = "OnPermissionsChange";

-	public static final String OnScreenPresetsAvailable = "OnScreenPresetsAvailable";

-	public static final String isHighlighted = "isHighlighted";

-	public static final String softButtonID = "softButtonID";

-	public static final String fileType = "fileType";

-	public static final String url = "url";

-	public static final String requestType = "requestType";

-	public static final String fileName = "fileName";

-	public static final String persistentFile = "persistentFile";

-	public static final String spaceAvailable = "spaceAvailable";

-	public static final String filenames = "filenames";

-	public static final String cmdIcon = "cmdIcon";

-	public static final String Slider = "Slider";

-	public static final String sliderPosition = "sliderPosition";

-	public static final String samplingRate = "samplingRate";

-	public static final String audioType = "audioType";

-	public static final String satRadioESN = "satRadioESN";

-	public static final String dtc = "dtc";

-	public static final String tryAgainTime = "tryAgainTime";

-

-	public static final String success = "success";

-	public static final String resultCode = "resultCode";

-	public static final String info = "info";

-	

-	public static final String payload = "payload";

-	public static final String reason = "reason";

-	public static final String state = "state";

-	public static final String cmdID = "cmdID";

-	public static final String menuParams = "menuParams";

-	public static final String parentID = "parentID";

-	public static final String position = "position";

-	public static final String menuName = "menuName";

-	public static final String vrCommands = "vrCommands";

-	public static final String language = "language";

-	public static final String languageDesired = "languageDesired";

-	public static final String triggerSource = "triggerSource";

-	public static final String subscriptionType = "subscriptionType";

-	public static final String data = "data";

-	public static final String event = "event";

-	public static final String correlationID = "correlationID";

-	public static final String sdlMsgVersion = "syncMsgVersion";

-	public static final String deviceInfo = "deviceInfo";	

-	public static final String majorVersion = "majorVersion";

-	public static final String minorVersion = "minorVersion";

-	public static final String appName = "appName";

-	public static final String ngnMediaScreenAppName = "ngnMediaScreenAppName";

-	public static final String isMediaApplication = "isMediaApplication";

-	public static final String vrSynonyms = "vrSynonyms";

-	public static final String usesVehicleData = "usesVehicleData";

-	public static final String text = "text";

-	public static final String type = "type";

-	public static final String ttsChunks = "ttsChunks";

-	public static final String playTone = "playTone";

-	public static final String duration = "duration";

-	public static final String mainField1 = "mainField1";

-	public static final String mainField2 = "mainField2";

-	public static final String mainField3 = "mainField3";

-	public static final String mainField4 = "mainField4";

-	public static final String statusBar = "statusBar";

-	public static final String name = "name";

-	public static final String menuID = "menuID";

-	public static final String longPress = "longPress";

-	public static final String shortPress = "shortPress";

-	public static final String buttonName = "buttonName";

-	public static final String buttonPressMode = "buttonPressMode";

-	public static final String buttonEventMode = "buttonEventMode";

-	public static final String minutes = "minutes";

-	public static final String seconds = "seconds";

-	public static final String startTime = "startTime";

-	public static final String endTime = "endTime";

-	public static final String updateMode = "updateMode";

-	public static final String mediaClock = "mediaClock";

-	public static final String initialText = "initialText";

-	public static final String initialPrompt = "initialPrompt";

-	public static final String helpPrompt = "helpPrompt";

-	public static final String timeoutPrompt = "timeoutPrompt";

-	public static final String timeout = "timeout";

-	public static final String choiceSet = "choiceSet";

-	public static final String interactionMode = "interactionMode";

-	public static final String result = "result";

-	public static final String alertText1 = "alertText1";

-	public static final String alertText2 = "alertText2";

-	public static final String alertText3 = "alertText3";

-	public static final String shortPressAvailable = "shortPressAvailable";

-	public static final String longPressAvailable = "longPressAvailable";

-	public static final String upDownAvailable = "upDownAvailable";

-	public static final String width = "width";

-	public static final String height = "height";

-	public static final String resolutionWidth = "resolutionWidth";

-	public static final String resolutionHeight = "resolutionHeight";

-	public static final String characterSet = "characterSet";

-	public static final String displayType = "displayType";

-	public static final String mediaClockFormats = "mediaClockFormats";

-	public static final String textFields = "textFields";

-	public static final String imageFields = "imageFields";

-	public static final String autoActivateID = "autoActivateID";

-	public static final String vehicleDataCapabilities = "vehicleDataCapabilities";

-	public static final String speechCapabilities = "speechCapabilities";

-	public static final String vrCapabilities = "vrCapabilities";

-	public static final String audioPassThruCapabilities = "audioPassThruCapabilities";

-	public static final String buttonCapabilities = "buttonCapabilities";

-	public static final String displayCapabilities = "displayCapabilities";

-	public static final String hmiZoneCapabilities = "hmiZoneCapabilities";

-	public static final String interactionChoiceSetID = "interactionChoiceSetID";

-	public static final String interactionChoiceSetIDList = "interactionChoiceSetIDList";

-	public static final String audioFileName = "audioFileName";

-	public static final String gpsPositionValid = "gpsPositionValid";

-	public static final String longitudeDegrees = "longitudeDegrees";

-	public static final String latitudeDegrees = "latitudeDegrees";

-	public static final String utcYear = "utcYear";

-	public static final String utcMonth = "utcMonth";

-	public static final String utcDay = "utcDay";

-	public static final String utcHours = "utcHours";

-	public static final String utcMinutes = "utcMinutes";

-	public static final String utcSeconds = "utcSeconds";

-	public static final String compassDirection = "compassDirection";

-	public static final String pdop = "pdop";

-	public static final String vdop = "vdop";

-	public static final String hdop = "hdop";

-	public static final String actual = "actual";

-	public static final String satellites = "satellites";

-	public static final String dimension = "dimension";

-	public static final String altitude = "altitude";

-	public static final String heading = "heading";

-	public static final String speed = "speed";

-	public static final String number = "number";

-	public static final String smartDeviceLinkFileName = "syncFileName";

-	public static final String localFileName = "localFileName";

-	public static final String maxDuration = "maxDuration";

-	public static final String timerMode = "timerMode";

-	public static final String status = "status";

-	public static final String pressure = "pressure";

-	public static final String hours = "hours";

-	public static final String rows = "rows";

-	public static final String pressureTellTale = "pressureTellTale";

-	public static final String leftFront = "leftFront";

-	public static final String rightFront = "rightFront";

-	public static final String leftRear = "leftRear";

-	public static final String rightRear = "rightRear";

-	public static final String innerLeftRear = "innerLeftRear";

-	public static final String innerRightRear = "innerRightRear";

-	public static final String VehicleData = "VehicleData";

-	public static final String alignment = "alignment";

-	public static final String mediaTrack = "mediaTrack";

-	public static final String properties = "properties";

-	public static final String choiceID = "choiceID";

-	public static final String bitsPerSample = "bitsPerSample";

-	public static final String hmiLevel = "hmiLevel";

-	public static final String audioStreamingState = "audioStreamingState";

-	public static final String systemContext = "systemContext";

-	public static final String sdlChoice = "sdlChoice";

-	public static final String sdlCommand = "sdlCommand";

-	public static final String URL = "URL";

-	public static final String Timeout = "Timeout";

-	public static final String PermissionGroupName = "PermissionGroupName";

-	public static final String PermissionGroupStatus = "PermissionGroupStatus";

-	public static final String PermissionGroupItems = "PermissionGroupItems";

-	public static final String audioPacket = "audioPacket";

-	public static final String audioPassThruDisplayText1 = "audioPassThruDisplayText1";

-	public static final String audioPassThruDisplayText2 = "audioPassThruDisplayText2";

-	public static final String bitRate = "bitRate";

-	public static final String rpm = "rpm";

-	public static final String fuelLevel = "fuelLevel";

-	public static final String avgFuelEconomy = "avgFuelEconomy";

-	public static final String batteryVoltage = "batteryVoltage";

-	public static final String externalTemperature = "externalTemperature";

-	public static final String vin = "vin";

-	public static final String prndl = "prndl";

-	public static final String tirePressure = "tirePressure";

-	public static final String batteryPackVoltage = "batteryPackVoltage";

-	public static final String batteryPackCurrent = "batteryPackCurrent";

-	public static final String batteryPackTemperature = "batteryPackTemperature";

-	public static final String engineTorque = "engineTorque";

-	public static final String odometer = "odometer";

-	public static final String tripOdometer = "tripOdometer";

-	public static final String genericbinary = "genericbinary";

-	public static final String GPSData = "GPSData";

-	public static final String gps = "gps";

-	public static final String fuelLevel_State = "fuelLevel_State";

-	public static final String instantFuelConsumption = "instantFuelConsumption";

-	public static final String beltStatus = "beltStatus";

-	public static final String bodyInformation = "bodyInformation";

-	public static final String deviceStatus = "deviceStatus";

-	public static final String driverBraking = "driverBraking";

-	public static final String wiperStatus = "wiperStatus";

-	public static final String fuelEconomy = "fuelEconomy";

-	public static final String engineOilLife = "engineOilLife";

-	public static final String headLampStatus = "headLampStatus";

-	public static final String brakeTorque = "brakeTorque";

-	public static final String turboBoost = "turboBoost";

-	public static final String coolantTemp = "coolantTemp";

-	public static final String airFuelRatio = "airFuelRatio";

-	public static final String coolingHeadTemp = "coolingHeadTemp";

-	public static final String oilTemp = "oilTemp";

-	public static final String intakeAirTemp = "intakeAirTemp";

-	public static final String gearShiftAdvice = "gearShiftAdvice";

-	public static final String acceleration = "acceleration";

-	public static final String accPedalPosition = "accPedalPosition";

-	public static final String clutchPedalPosition = "clutchPedalPosition";

-	public static final String reverseGearStatus = "reverseGearStatus";

-	public static final String accTorque = "accTorque";

-	public static final String ambientLightStatus = "ambientLightStatus";

-	public static final String ambientLightSensorStatus = "ambientLightSensorStatus";	

-	public static final String dataType = "dataType";

-	public static final String identifier = "identifier";

-	public static final String statusByte = "statusByte";

-	public static final String didResult = "didResult";

-	public static final String ecuName = "ecuName";

-	public static final String didLocation = "didLocation";

-	public static final String value = "value";

-	public static final String softButtonName = "softButtonName";

-	public static final String imageSupported = "imageSupported";

-	public static final String systemAction = "systemAction";

-	public static final String image = "image";

-	public static final String secondaryText = "secondaryText";

-	public static final String tertiaryText = "tertiaryText";

-	public static final String secondaryImage = "secondaryImage";	

-	public static final String imageType = "imageType";

-	public static final String fileData = "fileData";

-	public static final String scrollableMessageBody = "scrollableMessageBody";

-	public static final String softButtons = "softButtons";

-	public static final String customButtonID = "customButtonID";

-	public static final String vrHelp = "vrHelp";

-	public static final String interactionLayout = "interactionLayout";	

-	public static final String customButtonName = "customButtonName";

-	public static final String navigationText = "navigationText";

-	public static final String turnIcon = "turnIcon";

-	public static final String nextTurnIcon = "nextTurnIcon";

-	public static final String navigationText1 = "navigationText1";

-	public static final String navigationText2 = "navigationText2";

-	public static final String eta = "eta";

-	public static final String totalDistance = "totalDistance";

-	public static final String distanceToManeuver = "distanceToManeuver";

-	public static final String distanceToManeuverScale = "distanceToManeuverScale";

-	public static final String maneuverComplete = "maneuverComplete";

-	public static final String turnList = "turnList";

-	public static final String steeringWheelAngle = "steeringWheelAngle";	

-	public static final String menuTitle = "menuTitle";

-	public static final String menuIcon = "menuIcon";

-	public static final String keyboardProperties = "keyboardProperties";

-    public static final String driverBeltDeployed = "driverBeltDeployed";

-    public static final String passengerBeltDeployed = "passengerBeltDeployed";

-    public static final String passengerBuckleBelted = "passengerBuckleBelted";

-    public static final String driverBuckleBelted = "driverBuckleBelted";

-    public static final String leftRow2BuckleBelted = "leftRow2BuckleBelted";

-    public static final String passengerChildDetected = "passengerChildDetected";

-    public static final String rightRow2BuckleBelted = "rightRow2BuckleBelted";

-    public static final String middleRow2BuckleBelted = "middleRow2BuckleBelted";

-    public static final String middleRow3BuckleBelted = "middleRow3BuckleBelted";

-    public static final String leftRow3BuckleBelted = "leftRow3BuckleBelted";

-    public static final String rightRow3BuckleBelted = "rightRow3BuckleBelted";

-    public static final String rearInflatableBelted = "rearInflatableBelted";

-    public static final String leftRearInflatableBelted = "leftRearInflatableBelted";

-    public static final String rightRearInflatableBelted = "rightRearInflatableBelted";

-    public static final String middleRow1BeltDeployed = "middleRow1BeltDeployed";

-    public static final String middleRow1BuckleBelted = "middleRow1BuckleBelted";

-

-    public static final String graphicSupported = "graphicSupported";

-    public static final String screenParams = "screenParams";

-    public static final String muteAudio = "muteAudio";

-    public static final String parkBrakeActive = "parkBrakeActive";

-    public static final String ignitionStableStatus = "ignitionStableStatus";

-    public static final String ignitionStatus = "ignitionStatus";

-    public static final String driverDoorAjar = "driverDoorAjar";    

-    public static final String passengerDoorAjar = "passengerDoorAjar";

-    public static final String rearLeftDoorAjar = "rearLeftDoorAjar";

-    public static final String rearRightDoorAjar = "rearRightDoorAjar";

-    public static final String systemFile = "systemFile";

-        

-    public static final String voiceRecOn = "voiceRecOn";

-    public static final String btIconOn = "btIconOn";

-    public static final String callActive = "callActive";

-    public static final String phoneRoaming = "phoneRoaming";

-    public static final String textMsgAvailable = "textMsgAvailable";

-    public static final String battLevelStatus = "battLevelStatus";

-    public static final String stereoAudioOutputMuted = "stereoAudioOutputMuted";

-    public static final String monoAudioOutputMuted = "monoAudioOutputMuted";

-    public static final String signalLevelStatus = "signalLevelStatus";

-    public static final String primaryAudioSource = "primaryAudioSource";

-    public static final String eCallEventActive = "eCallEventActive";

-

-    public static final String fuelEconomySinceLastReset = "fuelEconomySinceLastReset";

-    public static final String currentTripFuelEconomy = "currentTripFuelEconomy";

-    public static final String averageTripFuelEconomy = "averageTripFuelEconomy";

-    public static final String currentCycleFuelEconomy = "currentCycleFuelEconomy";

-

-    public static final String lightSwitchStatus = "lightSwitchStatus";

-    public static final String highBeamsOn = "highBeamsOn";

-    public static final String lowBeamsOn = "lowBeamsOn";

-

-    public static final String electricFuelConsumption = "electricFuelConsumption";

-    public static final String stateOfCharge = "stateOfCharge";

-    public static final String fuelMaintenanceMode = "fuelMaintenanceMode";

-    public static final String distanceToEmpty = "distanceToEmpty";

-    

-    public static final String dtcMask = "dtcMask";

-    public static final String targetID = "targetID";

-    public static final String messageLength = "messageLength";

-    public static final String messageData = "messageData";

-    public static final String messageDataResult = "messageDataResult";

-        

-    public static final String imageTypeSupported = "imageTypeSupported";

-    public static final String imageResolution = "imageResolution";

-    public static final String x = "x";

-    public static final String y = "y";

-    public static final String id = "id";

-    public static final String ts = "ts";

-    public static final String c = "c";

-    public static final String resolution = "resolution";

-    public static final String touchEventAvailable = "touchEventAvailable";    

-    

-    public static final String pressAvailable = "pressAvailable";

-    public static final String multiTouchAvailable = "multiTouchAvailable";

-    public static final String doublePressAvailable = "doublePressAvailable";

-    public static final String templatesAvailable = "templatesAvailable";

-    public static final String numCustomPresetsAvailable = "numCustomPresetsAvailable";

-    public static final String prerecordedSpeech = "prerecordedSpeech";

-    public static final String manualTextEntry = "manualTextEntry";

-    public static final String progressIndicator = "progressIndicator";

-    public static final String secondaryGraphic = "secondaryGraphic";

-    public static final String offset = "offset";

-    public static final String length = "length";    

-    

-    public static final String hardware = "hardware";

-    public static final String firmwareRev = "firmwareRev";

-    public static final String os = "os";

-    public static final String osVersion = "osVersion";

-    public static final String carrier = "carrier";

-    public static final String maxNumberRFCOMMPorts = "maxNumberRFCOMMPorts";

-    

-    public static final String onReadDIDResponse = "onReadDIDResponse";    

-    public static final String onGetDTCsResponse = "onGetDTCsResponse";

-    public static final String onOnKeyboardInput = "onOnKeyboardInput";

-    public static final String onOnTouchEvent = "onOnTouchEvent";

-    public static final String onOnSystemRequest = "onOnSystemRequest";

-    

-    public static final String onDiagnosticMessageResponse = "onDiagnosticMessageResponse";

-    public static final String onSystemRequestResponse = "onSystemRequestResponse";

-    public static final String onGetVehicleDataResponse = "onGetVehicleDataResponse";

-    public static final String getSupportedDiagModes = "getSupportedDiagModes";

-    public static final String supportedDiagModes = "supportedDiagModes";

-    

-    public static final String driverAirbagDeployed = "driverAirbagDeployed";

-    public static final String driverSideAirbagDeployed = "driverSideAirbagDeployed";

-    public static final String driverCurtainAirbagDeployed = "driverCurtainAirbagDeployed";

-    public static final String passengerAirbagDeployed = "passengerAirbagDeployed";

-    public static final String passengerCurtainAirbagDeployed = "passengerCurtainAirbagDeployed";

-    public static final String driverKneeAirbagDeployed = "driverKneeAirbagDeployed";

-    public static final String passengerSideAirbagDeployed = "passengerSideAirbagDeployed";

-    public static final String passengerKneeAirbagDeployed = "passengerKneeAirbagDeployed";

-

-    public static final String powerModeActive = "powerModeActive";

-    public static final String powerModeQualificationStatus = "powerModeQualificationStatus";

-    public static final String carModeStatus = "carModeStatus";

-    public static final String powerModeStatus = "powerModeStatus";

-    

-    public static final String eCallNotificationStatus = "eCallNotificationStatus";

-    public static final String auxECallNotificationStatus = "auxECallNotificationStatus";

-    public static final String eCallConfirmationStatus = "eCallConfirmationStatus";

-    public static final String e911Override = "e911Override";

-    

-    public static final String emergencyEventType = "emergencyEventType";

-    public static final String fuelCutoffStatus = "fuelCutoffStatus";

-    public static final String rolloverEvent = "rolloverEvent";

-    public static final String maximumChangeVelocity = "maximumChangeVelocity";

-    public static final String multipleEvents = "multipleEvents";

-

-	public static final String eCallInfo = "eCallInfo";

-	public static final String airbagStatus = "airbagStatus";

-	public static final String emergencyEvent = "emergencyEvent";

-	public static final String clusterModeStatus = "clusterModeStatus";

-	public static final String myKey = "myKey";

-	public static final String timeToDestination = "timeToDestination";

-	

-	public static final String driverDistraction = "driverDistraction";

-	public static final String showLockScreen = "showLockScreen";

-	public static final String userSelected = "userSelected";

-	public static final String notSet = "notSet";

-	

-	public static final String headers = "headers";

-	public static final String body = "body";

-	

-	public static final String ContentType = "ContentType";

-	public static final String ConnectTimeout = "ConnectTimeout";

-	public static final String DoOutput = "DoOutput";

-	public static final String DoInput  = "DoInput";

-	public static final String UseCaches = "UseCaches";

-	public static final String RequestMethod = "RequestMethod";

-	public static final String ReadTimeout = "ReadTimeout";

-	public static final String InstanceFollowRedirects = "InstanceFollowRedirects";

-	public static final String charset = "charset";

-	public static final String ContentLength = "Content-Length";

-}

diff --git a/base/src/main/java/com/smartdevicelink/transport/BaseTransportConfig.java b/base/src/main/java/com/smartdevicelink/transport/BaseTransportConfig.java
index 57237d0bc..b037e2b1b 100644
--- a/base/src/main/java/com/smartdevicelink/transport/BaseTransportConfig.java
+++ b/base/src/main/java/com/smartdevicelink/transport/BaseTransportConfig.java
@@ -1,34 +1,34 @@
-/*
- * Copyright (c) 2017 - 2019, SmartDeviceLink Consortium, Inc.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided with the
- * distribution.
- *
- * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from this 
- * software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
+/*

+ * Copyright (c) 2017 - 2019, SmartDeviceLink Consortium, Inc.

+ * All rights reserved.

+ *

+ * Redistribution and use in source and binary forms, with or without

+ * modification, are permitted provided that the following conditions are met:

+ *

+ * Redistributions of source code must retain the above copyright notice, this

+ * list of conditions and the following disclaimer.

+ *

+ * Redistributions in binary form must reproduce the above copyright notice,

+ * this list of conditions and the following

+ * disclaimer in the documentation and/or other materials provided with the

+ * distribution.

+ *

+ * Neither the name of the SmartDeviceLink Consortium, Inc. nor the names of its

+ * contributors may be used to endorse or promote products derived from this 

+ * software without specific prior written permission.

+ *

+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"

+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE

+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR

+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF

+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS

+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN

+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE

+ * POSSIBILITY OF SUCH DAMAGE.

+ */

 package com.smartdevicelink.transport;

 

 import com.smartdevicelink.transport.enums.TransportType;

@@ -37,26 +37,13 @@ import com.smartdevicelink.transport.enums.TransportType;
  * Defines base abstract class for transport configurations.

  */

 public abstract class BaseTransportConfig {

-	

-	protected boolean shareConnection = true;

 	protected int iHeartBeatTimeout = Integer.MAX_VALUE;

 	/**

 	 * Gets transport type for this transport configuration.

 	 * 

 	 * @return One of {@link TransportType} enumeration values that represents type of this transport configuration.

 	 */

-	public abstract TransportType getTransportType();	

-	

-	/**

-	 * @deprecated

-	 * Indicate whether the application want to share connection with others.

-	 * 

-	 * @return a boolean if this conneciton should be shared

-	 */

-	@Deprecated

-	public boolean shareConnection() {

-		return shareConnection;

-	}

+	public abstract TransportType getTransportType();

 	

 	public int getHeartBeatTimeout() {

 		return iHeartBeatTimeout;

diff --git a/hello_sdl_java/src/main/java/com/smartdevicelink/java/SdlService.java b/hello_sdl_java/src/main/java/com/smartdevicelink/java/SdlService.java
index c619b46fb..8c5eda17c 100644
--- a/hello_sdl_java/src/main/java/com/smartdevicelink/java/SdlService.java
+++ b/hello_sdl_java/src/main/java/com/smartdevicelink/java/SdlService.java
@@ -47,7 +47,6 @@ import com.smartdevicelink.managers.screen.menu.VoiceCommand;
 import com.smartdevicelink.managers.screen.menu.VoiceCommandSelectionListener;
 import com.smartdevicelink.protocol.enums.FunctionID;
 import com.smartdevicelink.proxy.RPCNotification;
-import com.smartdevicelink.proxy.TTSChunkFactory;
 import com.smartdevicelink.proxy.rpc.*;
 import com.smartdevicelink.proxy.rpc.enums.*;
 import com.smartdevicelink.proxy.rpc.listeners.OnRPCNotificationListener;
@@ -165,7 +164,8 @@ public class SdlService {
                             break;
                     }
                     if (isNeedUpdate) {
-                        return new LifecycleConfigurationUpdate(appName, null, TTSChunkFactory.createSimpleTTSChunks(ttsName), null);
+                        Vector<TTSChunk> chunks = new Vector<>(Collections.singletonList(new TTSChunk(ttsName, SpeechCapabilities.TEXT)));
+                        return new LifecycleConfigurationUpdate(appName, null, chunks, null);
                     } else {
                         return null;
                     }
@@ -297,7 +297,8 @@ public class SdlService {
      * Will speak a sample welcome message
      */
     private void performWelcomeSpeak(){
-        sdlManager.sendRPC(new Speak(TTSChunkFactory.createSimpleTTSChunks(WELCOME_SPEAK)));
+        List<TTSChunk> chunks = Collections.singletonList(new TTSChunk(WELCOME_SPEAK, SpeechCapabilities.TEXT));
+        sdlManager.sendRPC(new Speak(chunks));
     }
 
     /**
@@ -360,7 +361,8 @@ public class SdlService {
         sdlManager.getScreenManager().setTextField2("");
         sdlManager.getScreenManager().commit(null);
 
-        sdlManager.sendRPC(new Speak(TTSChunkFactory.createSimpleTTSChunks(TEST_COMMAND_NAME)));
+        List<TTSChunk> chunks = Collections.singletonList(new TTSChunk(TEST_COMMAND_NAME, SpeechCapabilities.TEXT));
+        sdlManager.sendRPC(new Speak(chunks));
     }
 
     private void showAlert(String text){
diff --git a/javaSE/src/main/java/com/smartdevicelink/transport/WebSocketServerConfig.java b/javaSE/src/main/java/com/smartdevicelink/transport/WebSocketServerConfig.java
index 6add5ae71..23e0b25c1 100644
--- a/javaSE/src/main/java/com/smartdevicelink/transport/WebSocketServerConfig.java
+++ b/javaSE/src/main/java/com/smartdevicelink/transport/WebSocketServerConfig.java
@@ -46,7 +46,6 @@ public class WebSocketServerConfig extends BaseTransportConfig{
      */
     public WebSocketServerConfig(int port, int connectionLostTimeout){
         this.port = port;
-        this.shareConnection = false;
         this.connectionLostTimeout = connectionLostTimeout;
     }