Cleanup stretch artifacts

Don't need to keep the stretch/buster diversions around for longer than the transition period...