diff --git a/Pmodules/modbuild b/Pmodules/modbuild
index 4588dca..1185baa 100755
--- a/Pmodules/modbuild
+++ b/Pmodules/modbuild
@@ -357,17 +357,17 @@ if [[ ${bootstrap} == no ]]; then
         source	"${PMODULES_ROOT}/${PMODULES_CONFIG_DIR}/profile.bash"
 	MODULECMD="${PMODULES_HOME}/bin/modulecmd"
 	[[ -x ${MODULECMD} ]] || std::die 1 "${MODULECMD}: no such executable"
-	eval $( "${MODULECMD}" bash purge )
 	
 	# Cleanup environment:
 	# Unset all PATH's and FLAGS's which might be used by a compiler.
 	# This includes C_INCLUDE_PATH, CFLAGS etc.
+	eval $( "${MODULECMD}" bash purge )
 	pbuild::cleanup_env
 	pbuild::set_initial_path
-	PATH+="${mydir}"
 
 	# :FIXME: this is a hack!!!
 	eval $( "${MODULECMD}" bash use unstable )
+	eval $( "${MODULECMD}" bash use deprecated )
 	eval $( "${MODULECMD}" bash use Libraries )
 	for m in "${with_modules[@]}"; do
 		if pbuild::module_is_available "$m"; then
@@ -381,7 +381,6 @@ else
 	#  the module command is not yet available...
 	pbuild::cleanup_env
 	pbuild::set_initial_path
-	PATH+="${mydir}"
 	unset PMODULES_HOME
 	unset PMODULES_VERSION
 	std::read_versions "${BUILD_BASEDIR}/config/versions.conf"