clean up commented cruft