* more cleanup of OSX compilation