Cleaning up debugging cruft