Clean up and add sweep to new speed.