Better cleanup of previous submit.