Applies misc. cleanup as part of a vain effort to get the ITs to pass.