Cleaned code and removed compile args, --without not needed anymore