Eliminate OSXServices (except in branch "forOSX")