More cleanups to reduce diff