Add default forms for XY pokemon.
Remove some innerjoins which no longer hold.