Cleanup cruft