Remove commented-out code and obsolete debug output.
Remove chatty debug output.