Removing debug cruft