More low risk code cleanups