removing unused stuff, only unit tests