cleaned up some old code and comments