Cleanup cruft
Cleanup cruft