Remove debugging output, clean up
Removed out-of-date comment