removing tmp hacking
removed tests
removing unused code