Fixing import error
Removing old osx stuff