Cleaning up debugging stuff