Remove unused templates, fix validation on oneOfEach, add 2x new templates