Simplify OSX check
WIP