Some final cleanup before we push V2.5