Clean up the mess I left in #1006

Remove a print statement and some commented out code.