More cleanup on various files