Done; cleanUp before submitting