First clean up before submission
First clean up before submission