remove non used stuff, merge osx stuff