Small cleanup [ci-skip]