clean up some code remove old comments and stuff