Remove a redundant check
Validate templates/moves properly in gen 1