clean up
removing legacy code