Cleanup for nom submit