diff --git a/source/com.microsoft.tfs.client.clc/debugscripts/tfdev b/source/com.microsoft.tfs.client.clc/debugscripts/tfdev
index 02059eca6..fd5b814bd 100755
--- a/source/com.microsoft.tfs.client.clc/debugscripts/tfdev
+++ b/source/com.microsoft.tfs.client.clc/debugscripts/tfdev
@@ -170,6 +170,6 @@ if [ $JAVA_DEBUG ]; then
 	JAVA_DEBUG_FLAGS="-Xdebug -Xnoagent -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=y"
 fi
 
-exec java -Xmx512M $JAVA_DEBUG_FLAGS -classpath "$CLC_CLASSPATH" \
+exec java $JAVA_DEBUG_FLAGS -classpath "$CLC_CLASSPATH" \
 	"-Dcom.microsoft.tfs.jni.native.base-directory=$BASE_DIRECTORY/../../com.microsoft.tfs.jni/os" \
     $RANDOM_DEVICE_PROPERTY $LAUNCHER_CLASS "$@"
diff --git a/source/com.microsoft.tfs.client.clc/debugscripts/tfdev.cmd b/source/com.microsoft.tfs.client.clc/debugscripts/tfdev.cmd
index 601136e93..4b9eff47c 100644
--- a/source/com.microsoft.tfs.client.clc/debugscripts/tfdev.cmd
+++ b/source/com.microsoft.tfs.client.clc/debugscripts/tfdev.cmd
@@ -42,7 +42,7 @@ if DEFINED JAVA_DEBUG set JAVA_DEBUG_FLAGS=-Xdebug -Xnoagent -Xrunjdwp:transport
 
 setlocal DISABLEDELAYEDEXPANSION
 
-java -Xmx512M %JAVA_DEBUG_FLAGS% -cp %CLC_CLASSPATH% "-Dcom.microsoft.tfs.jni.native.base-directory=%BASE_DIRECTORY%..\..\com.microsoft.tfs.jni\os" %LAUNCHER_CLASS% %*
+java %JAVA_DEBUG_FLAGS% -cp %CLC_CLASSPATH% "-Dcom.microsoft.tfs.jni.native.base-directory=%BASE_DIRECTORY%..\..\com.microsoft.tfs.jni\os" %LAUNCHER_CLASS% %*
 
 set RETURN_VALUE=%errorlevel%
 goto end
diff --git a/source/com.microsoft.tfs.client.clc/debugscripts/witdev b/source/com.microsoft.tfs.client.clc/debugscripts/witdev
index 215e6cb2a..466494f87 100755
--- a/source/com.microsoft.tfs.client.clc/debugscripts/witdev
+++ b/source/com.microsoft.tfs.client.clc/debugscripts/witdev
@@ -151,6 +151,6 @@ if [ `uname` = "Linux" ] ; then
     RANDOM_DEVICE_PROPERTY="-Djava.security.egd=file:/dev/urandom"
 fi
 
-exec java -Xmx512M -classpath "$CLC_CLASSPATH" \
+exec java -classpath "$CLC_CLASSPATH" \
 	"-Dcom.microsoft.tfs.jni.native.base-directory=$BASE_DIRECTORY/../../com.microsoft.tfs.jni/os" \
     $RANDOM_DEVICE_PROPERTY $LAUNCHER_CLASS "$@"
diff --git a/source/com.microsoft.tfs.client.clc/debugscripts/witdev.cmd b/source/com.microsoft.tfs.client.clc/debugscripts/witdev.cmd
index fc6b9c779..634ddf5b7 100644
--- a/source/com.microsoft.tfs.client.clc/debugscripts/witdev.cmd
+++ b/source/com.microsoft.tfs.client.clc/debugscripts/witdev.cmd
@@ -39,7 +39,7 @@ for %%a in (%DEP_PROJECTS_LIBDIRS%) do (for %%u in (%%a\*.jar) do set CLC_CLASSP
 
 setlocal DISABLEDELAYEDEXPANSION
 
-java -Xmx512M -cp %CLC_CLASSPATH% "-Dcom.microsoft.tfs.jni.native.base-directory=%BASE_DIRECTORY%..\..\com.microsoft.tfs.jni\os" %LAUNCHER_CLASS% %*
+java -cp %CLC_CLASSPATH% "-Dcom.microsoft.tfs.jni.native.base-directory=%BASE_DIRECTORY%..\..\com.microsoft.tfs.jni\os" %LAUNCHER_CLASS% %*
 
 set RETURN_VALUE=%errorlevel%
 goto end
diff --git a/source/com.microsoft.tfs.client.clc/scripts/clc-launcher b/source/com.microsoft.tfs.client.clc/scripts/clc-launcher
index 899844ef6..8da08c2e7 100755
--- a/source/com.microsoft.tfs.client.clc/scripts/clc-launcher
+++ b/source/com.microsoft.tfs.client.clc/scripts/clc-launcher
@@ -144,6 +144,6 @@ if [ `uname` = "Linux" ] ; then
     RANDOM_DEVICE_PROPERTY="-Djava.security.egd=file:/dev/urandom"
 fi
 
-exec java -Xmx2048M -classpath "$CLC_CLASSPATH" $TF_ADDITIONAL_JAVA_ARGS \
+exec java -classpath "$CLC_CLASSPATH" $TF_ADDITIONAL_JAVA_ARGS \
 	"-Dcom.microsoft.tfs.jni.native.base-directory=$BASE_DIRECTORY/native" \
     $RANDOM_DEVICE_PROPERTY @@LAUNCHER_CLASS@@ "$@"
diff --git a/source/com.microsoft.tfs.client.clc/scripts/clc-launcher.cmd b/source/com.microsoft.tfs.client.clc/scripts/clc-launcher.cmd
index 8497ba629..98d5303eb 100644
--- a/source/com.microsoft.tfs.client.clc/scripts/clc-launcher.cmd
+++ b/source/com.microsoft.tfs.client.clc/scripts/clc-launcher.cmd
@@ -39,7 +39,7 @@ set CLC_CLASSPATH=%CLC_CLASSPATH%;%AI_JAR%
 
 setlocal DISABLEDELAYEDEXPANSION
 
-java -Xmx2048M -cp %CLC_CLASSPATH% %TF_ADDITIONAL_JAVA_ARGS% "-Dcom.microsoft.tfs.jni.native.base-directory=%BASE_DIRECTORY%native" @@LAUNCHER_CLASS@@ %*
+java -cp %CLC_CLASSPATH% %TF_ADDITIONAL_JAVA_ARGS% "-Dcom.microsoft.tfs.jni.native.base-directory=%BASE_DIRECTORY%native" @@LAUNCHER_CLASS@@ %*
 
 set RETURN_VALUE=%errorlevel%
 goto end