Cleaning out some cruft