Some minor cleaning up of various files [ci skip].