Clean up any straddling trash before we finish