remove ifdef switches and build flag