removed more useless code, sould fix OSX build
merge