Removed most of OSX-specific config, TBC