Cleanup for no submission only