cleans up some comments and removes cruft