Clean up for submission scripts
Removal of single trigger requirement
Update todo list