Cleanup around OSX config