More cleanups and a forgotten file