lots of cleanup of false TODOs
it seems that some class files made it in at some point