diff --git a/cmake_targets/tools/build_epc b/cmake_targets/tools/build_epc
index 0f2cc9715f786fb066e7eba0859a0890deafdfb3..c29533879f814b8773bd16035d3d76ca86a874ad 100755
--- a/cmake_targets/tools/build_epc
+++ b/cmake_targets/tools/build_epc
@@ -233,12 +233,12 @@ function main()
   ##############################################################################
   # Compile userspace executable
   ##############################################################################
-  rm -f $OPENAIR_DIR/targets/bin/mme_gw
   cd $OPENAIR_DIR/cmake_targets/epc_build_oai
   if [ $clean -ne 0 ]; then
     if [[ $verbose -eq 1 ]]; then
-      echo "Cleaning EPC"
+      echo "Cleaning EPC: certificates, generated configuration files, obj files, mme_gw executable, GTP kernel module"
     fi
+    rm -f $OPENAIR_DIR/targets/bin/mme_gw
     rm -Rf build 2>&1
     $SUDO rm -Rf $OPENAIR_TARGETS/CMAKE/EPC/MME_GW/build  2>&1
     $SUDO rm -f /usr/local/etc/freeDiameter/mme*    2>&1
@@ -273,9 +273,6 @@ function main()
       epc_build_oai mme_gw \
       mme_gw $dbin/mme_gw.$REL
     # Only integrated mme+sgw+pgw is operational today
-    #    compilations \
-    #  epc_build_oai oai_sgw \
-    #  oai_sgw $dbin/oai_sgw.$REL
     compilations \
       epc_build_oai xt_GTPUAH_lib \
       libxt_GTPUAH_lib.so $dbin
@@ -298,9 +295,6 @@ function main()
   else
     echo_fatal "not installed EPC config files: not found"
   fi
-
-
-    
 }