REM: Some preprocessor flag that were not needed