As is the rule, every big committ must be followed by several cleanups.