Minor cleanup

Stripping extra comments and gunk from a couple of files