clean up some unused code
removing old tests