Cleanup some cruft