Some cleanup. [ci skip]