Do more trivial cleanup.