Removed garbage comments

I've removed all the garbage comments that have been left in the code so
that I don't get confused with what I've changed and what I haven't
changed.