Cleanup upload templates
Cleanup upload templates
Bring everything up to date