More cleanup [skip ci]