removed unused stuff to get it compiling under os x