Additional cleanup. [skip ci]