remove OS X specific items. fix import paths