Remove some debugging cruft