Cleaned up some comments

Meant to do more but it failed so I removed it. Still cleaned up a bit
of trash comments.