Clean up bad comment and commented test code

Sloppy sloppy.