clean up some comments, un-needed code