diff --git a/source/fortran/Makefile.gfortran b/source/fortran/Makefile.gfortran
index 431bc2794d4ba91a7ac2231ebb5a5d42674c7f8c..0c46c5b3c9e0255339c9a0d28e83648997ceab0e 100644
--- a/source/fortran/Makefile.gfortran
+++ b/source/fortran/Makefile.gfortran
@@ -10,7 +10,7 @@
 .SUFFIXES: .o .c .c~ .f .f~ .F90 .f90 .f90~ .f95 .f95~ .F .F~ .y .y~ .l .l~ \
            .s .s~ .sh .sh~ .h .h~ .C .C~ .a
 
-OPT	= -g
+OPT	= -O3
 DEBUG	= -g
 LIB     =  $(ECCODES_LIB) $(EMOSLIB)   
 
diff --git a/source/fortran/Makefile.local.gfortran b/source/fortran/Makefile.local.gfortran
index 7853267de92e8027d0fa60ef4c25d7b62fdd866b..0e03b8d7c1335cce4f9a8baa1035c904d85df176 100644
--- a/source/fortran/Makefile.local.gfortran
+++ b/source/fortran/Makefile.local.gfortran
@@ -14,14 +14,10 @@
 GRIB_API_INCLUDE_DIR=/usr/local/gcc-4.9.3/grib_api-1.14.3/include
 GRIB_API_LIB= -L/usr/local/gcc-4.9.3/grib_api-1.14.3/lib -Bstatic  -lgrib_api_f77 -lgrib_api_f90 -lgrib_api -Bdynamic  -lm  -ljasper
 
-#GRIB_API_INCLUDE_DIR=/home/srvx1/tmc/TestEnv/Libraries/eccodes-2.6.0_ifort/include
-#GRIB_API_LIB=-L/home/srvx1/tmc/TestEnv/Libraries/eccodes-2.6.0_ifort/lib -Bstatic -leccodes_f90  -leccodes -Bdynamic -lm -ljasper -openmp
-
-
 EMOSLIB=-lemosR64
 
-OPT	= -g -O3 -fopenmp
-DEBUG	= -g
+OPT	= -O3 -fopenmp
+DEBUG	= -O3
 LIB     =  $(GRIB_API_LIB) $(EMOSLIB)
 
 FC=gfortran   -m64 -fdefault-real-8 -fcray-pointer -fno-second-underscore  -ffixed-line-length-132 -fopenmp  -fconvert=big-endian  
diff --git a/source/fortran/Makefile.local.ifort b/source/fortran/Makefile.local.ifort
index d54e99554af499b36e1b5b5e4bd9d3adc3a0287e..2744a9e38af4069a9dc4f9bc3fad90abda4e4ed3 100644
--- a/source/fortran/Makefile.local.ifort
+++ b/source/fortran/Makefile.local.ifort
@@ -10,19 +10,12 @@
 .SUFFIXES: .o .c .c~ .f .f~ .F90 .f90 .f90~ .f95 .f95~ .F .F~ .y .y~ .l .l~ \
            .s .s~ .sh .sh~ .h .h~ .C .C~ .a
 
-#GRIB_API_INCLUDE_DIR=/home/srvx1/tmc/TestEnv/Libraries/grib_api-1.25.0_ifort/include
-#GRIB_API_LIB=-L/home/srvx1/tmc/TestEnv/Libraries/grib_api-1.25.0_ifort/lib  -Bstatic  -lgrib_api_f77 -lgrib_api_f90 -lgrib_api -Bdynamic  -lm  -ljasper -qopenmp
+GRIB_API_INCLUDE_DIR=/usr/local/include
+GRIB_API_LIB= -L/usr/local/lib -leccodes_f90  -leccodes -lm  -ljasper
 
 
-#GRIB_API_INCLUDE_DIR=/usr/local/ifort/grib1.12.3//include
-#GRIB_API_LIBS=-openmp -L/usr/local/ifort/grib1.12.3/lib -Bstatic  -lgrib_api_f77 -lgrib_api_f90 -lgrib_api -Bdynamic  -lm  -ljasper
-           
-           
-GRIB_API_INCLUDE_DIR=/home/srvx1/tmc/TestEnv/Libraries/eccodes-2.6.0_ifort/include
-GRIB_API_LIB= -L/home/srvx1/tmc/TestEnv/Libraries/eccodes-2.6.0_ifort/lib -Bstatic  -leccodes_f90  -leccodes -Bdynamic  -lm  -ljasper
-
 OPT	= -g -O3 -mcmodel=medium -unroll -inline -heap-arrays 32 
-DEBUG	= -g
+DEBUG	= ''
 LIB     =  $(GRIB_API_LIB) -lemosR64 -lgfortran
 
 FC=/opt/intel/composerxe/bin/ifort -132  -traceback -r8
@@ -35,7 +28,7 @@ LDFLAGS =  $(OPT)
 
 BINDIR  =      .
 
-EXE	=      CONVERT2
+EXE	=      CONVERT2.s8.ifort
 
 
 .f.o: