Yes, i did withdraw the excess contributions and the scenario indicated above was what happened to my case.
