Removing compile time options, not needed