Clean up, starting a second version.