reverting and removing cruft