Cleanup (get rid of debug code that sneaked in)