Cleaning up cruft