More cleanup
Stupid debug code