Some final cleanup before 1.0