clean up some comments and old code