diff --git a/Makefile b/Makefile
index 8427de4a..29f11113 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ BLUE=
 BLACK=(B
 
 
-.PHONY: doc src curl m4 ocaml irpf90 emsl build binary
+.PHONY: doc src ocaml build binary
 
 default: 
 	@echo   -----------------------------------------------
@@ -26,16 +26,11 @@ build:
 	@echo     source quantum_package.rc
 	@echo   -----------------------------------------------
 else
-build: EZFIO curl m4 irpf90 emsl 
+build: 
 	$(MAKE) -C src
 	$(MAKE) -C ocaml
 endif
 
-curl: bin/curl
-m4: bin/m4
-irpf90: bin/irpf90
-emsl: EMSL_Basis
-
 binary: 
 	$(QPACKAGE_ROOT)/scripts/make_binary.sh
 
diff --git a/setup_environment.sh b/setup_environment.sh
index ca853fdf..24d3f844 100755
--- a/setup_environment.sh
+++ b/setup_environment.sh
@@ -11,23 +11,6 @@ BLACK="(B"
 QPACKAGE_ROOT="$( cd "$(dirname "$BASH_SOURCE")"  ; pwd -P )"
 
 
-if [[ -z "${IRPF90}" ]] ;
-then
-    make irpf90
-    IRPF90="${QPACKAGE_ROOT}"/bin/irpf90
-    if [[ ! -x "${IRPF90}" ]]
-    then
-      echo $RED "Error in IRPF90 installation" $BLACK
-      exit 1
-    fi
-fi
-
-
-if [[ -z ${OCAMLBREW_BASE} ]]
-then
-  export OCAMLBREW_BASE="$HOME/ocamlbrew"
-fi
-
 cat << EOF > quantum_package.rc
 export IRPF90="${IRPF90}"
 export QPACKAGE_ROOT=\$( cd \$(dirname "\${BASH_SOURCE}")  ; pwd -P )