Final cleanup before working on main.