After you file

YES ... if you stop over contributing the excess goes away automatically.