diff --git a/build/jam/HaikuPackages b/build/jam/HaikuPackages
index 896cdcd288..cae0a186b8 100644
--- a/build/jam/HaikuPackages
+++ b/build/jam/HaikuPackages
@@ -401,8 +401,8 @@ AddFilesToPackage $(developDirTokens) lib : libposix_error_mapper.a ;
 
 # ABI independent stuff
 
-# scripts: cc and c++ wrapper, freetype-config, setgcc
-local scripts = cc c++ freetype-config setgcc ;
+# scripts: freetype-config, setgcc
+local scripts = freetype-config setgcc ;
 SEARCH on $(scripts) = [ FDirName $(HAIKU_TOP) data bin ] ;
 AddFilesToPackage bin : $(scripts) ;
 
diff --git a/data/system/boot/SetupEnvironment b/data/system/boot/SetupEnvironment
index 08198c1775..b4da8e6bd0 100644
--- a/data/system/boot/SetupEnvironment
+++ b/data/system/boot/SetupEnvironment
@@ -30,14 +30,6 @@ export BELIBRARIES
 export BEINCLUDES
 export BE_HOST_CPU
 
-# for the "cc" and "ld" shell scripts
-
-export BE_C_COMPILER=gcc
-export BE_CPLUS_COMPILER="g++"
-export BE_LINKER=ld
-export BE_DEFAULT_C_FLAGS=""
-export BE_DEFAULT_CPLUS_FLAGS=""
-
 if [ "$SAFEMODE" != "yes" ]
 then
 	export PATH=.:$HOME/config/non-packaged/bin:$HOME/config/bin:/boot/common/non-packaged/bin:/boot/common/bin:/bin:/boot/apps:/boot/preferences:/boot/system/apps:/boot/system/preferences