Cleaning up the debug stuff I'm not using anymore