diff --git a/common/src/main/resources/data/cobblemon/species/generation1/pikachu.json b/common/src/main/resources/data/cobblemon/species/generation1/pikachu.json
index 03858c27ac..026cf4c2e5 100644
--- a/common/src/main/resources/data/cobblemon/species/generation1/pikachu.json
+++ b/common/src/main/resources/data/cobblemon/species/generation1/pikachu.json
@@ -259,107 +259,7 @@
         "partner-cap"
       ],
       "eggGroups": [
-        "undiscovered",
-        "field",
-        "fairy"
-      ],
-      "moves": [
-        "1:tailwhip",
-        "1:thundershock",
-        "1:growl",
-        "1:playnice",
-        "1:quickattack",
-        "1:nuzzle",
-        "1:sweetkiss",
-        "1:nastyplot",
-        "1:charm",
-        "4:thunderwave",
-        "8:doubleteam",
-        "12:electroball",
-        "16:feint",
-        "20:spark",
-        "24:agility",
-        "28:slam",
-        "32:discharge",
-        "36:thunderbolt",
-        "40:lightscreen",
-        "44:thunder",
-        "tm:agility",
-        "tm:alluringvoice",
-        "tm:bodyslam",
-        "tm:brickbreak",
-        "tm:charge",
-        "tm:chargebeam",
-        "tm:charm",
-        "tm:covet",
-        "tm:dig",
-        "tm:disarmingvoice",
-        "tm:discharge",
-        "tm:doubleteam",
-        "tm:drainingkiss",
-        "tm:echoedvoice",
-        "tm:eerieimpulse",
-        "tm:electricterrain",
-        "tm:electroball",
-        "tm:electroweb",
-        "tm:encore",
-        "tm:endeavor",
-        "tm:endure",
-        "tm:facade",
-        "tm:fakeout",
-        "tm:faketears",
-        "tm:feint",
-        "tm:flail",
-        "tm:fling",
-        "tm:focuspunch",
-        "tm:grassknot",
-        "tm:growl",
-        "tm:helpinghand",
-        "tm:irontail",
-        "tm:knockoff",
-        "tm:laserfocus",
-        "tm:lightscreen",
-        "tm:magnetrise",
-        "tm:megakick",
-        "tm:megapunch",
-        "tm:nastyplot",
-        "tm:nuzzle",
-        "tm:payday",
-        "tm:playnice",
-        "tm:playrough",
-        "tm:present",
-        "tm:protect",
-        "tm:quickattack",
-        "tm:raindance",
-        "tm:reflect",
-        "tm:rest",
-        "tm:reversal",
-        "tm:risingvoltage",
-        "tm:shockwave",
-        "tm:signalbeam",
-        "tm:slam",
-        "tm:sleeptalk",
-        "tm:spark",
-        "tm:substitute",
-        "tm:surf",
-        "tm:sweetkiss",
-        "tm:swift",
-        "tm:tailwhip",
-        "tm:takedown",
-        "tm:terablast",
-        "tm:thief",
-        "tm:thunder",
-        "tm:thunderbolt",
-        "tm:thunderpunch",
-        "tm:thundershock",
-        "tm:thunderwave",
-        "tm:tickle",
-        "tm:trailblaze",
-        "tm:upperhand",
-        "tm:voltswitch",
-        "tm:volttackle",
-        "tm:wildcharge",
-        "tm:wish"
+        "undiscovered"
       ],
       "evolutions": [],
       "battleOnly": false
diff --git a/common/src/main/resources/data/cobblemon/species/generation6/floette.json b/common/src/main/resources/data/cobblemon/species/generation6/floette.json
index 231902b674..93cadbb40c 100644
--- a/common/src/main/resources/data/cobblemon/species/generation6/floette.json
+++ b/common/src/main/resources/data/cobblemon/species/generation6/floette.json
@@ -300,8 +300,7 @@
         "flower-eternal"
       ],
       "eggGroups": [
-        "undiscovered",
-        "fairy"
+        "undiscovered"
       ],
       "baseStats": {
         "hp": 74,
@@ -324,6 +323,90 @@
           }
         ]
       },
+      "moves": [
+        "1:tackle",
+        "1:vinewhip",
+        "1:fairywind",
+        "1:luckychant",
+        "10:safeguard",
+        "15:razorleaf",
+        "20:wish",
+        "25:magicalleaf",
+        "27:grassyterrain",
+        "33:petalblizzard",
+        "38:aromatherapy",
+        "43:mistyterrain",
+        "46:moonblast",
+        "50:lightofruin",
+        "51:petaldance",
+        "58:solarbeam",
+        "egg:camouflage",
+        "egg:captivate",
+        "egg:copycat",
+        "egg:endeavor",
+        "egg:tearfullook",
+        "tm:afteryou",
+        "tm:alluringvoice",
+        "tm:allyswitch",
+        "tm:aromatherapy",
+        "tm:batonpass",
+        "tm:calmmind",
+        "tm:camouflage",
+        "tm:captivate",
+        "tm:charm",
+        "tm:chillingwater",
+        "tm:copycat",
+        "tm:covet",
+        "tm:dazzlinggleam",
+        "tm:disarmingvoice",
+        "tm:drainingkiss",
+        "tm:echoedvoice",
+        "tm:endeavor",
+        "tm:endure",
+        "tm:energyball",
+        "tm:facade",
+        "tm:fairywind",
+        "tm:flash",
+        "tm:gigadrain",
+        "tm:grassknot",
+        "tm:grassyterrain",
+        "tm:healbell",
+        "tm:helpinghand",
+        "tm:lightscreen",
+        "tm:luckychant",
+        "tm:magicalleaf",
+        "tm:magiccoat",
+        "tm:metronome",
+        "tm:mistyterrain",
+        "tm:moonblast",
+        "tm:naturepower",
+        "tm:petalblizzard",
+        "tm:petaldance",
+        "tm:pollenpuff",
+        "tm:protect",
+        "tm:psychic",
+        "tm:raindance",
+        "tm:razorleaf",
+        "tm:rest",
+        "tm:safeguard",
+        "tm:seedbomb",
+        "tm:skillswap",
+        "tm:sleeptalk",
+        "tm:solarbeam",
+        "tm:storedpower",
+        "tm:substitute",
+        "tm:sunnyday",
+        "tm:swift",
+        "tm:synthesis",
+        "tm:tackle",
+        "tm:tearfullook",
+        "tm:terablast",
+        "tm:trailblaze",
+        "tm:trick",
+        "tm:vinewhip",
+        "tm:wish",
+        "tm:worryseed"
+      ],
       "evolutions": [],
       "battleOnly": false
     }
diff --git a/common/src/main/resources/data/cobblemon/species/generation6/greninja.json b/common/src/main/resources/data/cobblemon/species/generation6/greninja.json
index 6cc0f9aef3..dcf58e7992 100644
--- a/common/src/main/resources/data/cobblemon/species/generation6/greninja.json
+++ b/common/src/main/resources/data/cobblemon/species/generation6/greninja.json
@@ -220,107 +220,7 @@
         "h:battlebond"
       ],
       "eggGroups": [
-        "undiscovered",
-        "water_1"
-      ],
-      "moves": [
-        "1:watershuriken",
-        "1:nightslash",
-        "1:haze",
-        "1:roleplay",
-        "1:matblock",
-        "1:pound",
-        "1:growl",
-        "1:bubble",
-        "1:quickattack",
-        "1:watergun",
-        "10:lick",
-        "14:waterpulse",
-        "19:smokescreen",
-        "23:shadowsneak",
-        "28:spikes",
-        "33:feintattack",
-        "42:substitute",
-        "49:extrasensory",
-        "56:doubleteam",
-        "68:hydropump",
-        "tm:acrobatics",
-        "tm:aerialace",
-        "tm:blizzard",
-        "tm:bounce",
-        "tm:brickbreak",
-        "tm:brutalswing",
-        "tm:bubble",
-        "tm:chillingwater",
-        "tm:counter",
-        "tm:darkpulse",
-        "tm:dig",
-        "tm:dive",
-        "tm:doubleteam",
-        "tm:echoedvoice",
-        "tm:endure",
-        "tm:extrasensory",
-        "tm:facade",
-        "tm:falseswipe",
-        "tm:feintattack",
-        "tm:fling",
-        "tm:gigaimpact",
-        "tm:grassknot",
-        "tm:growl",
-        "tm:gunkshot",
-        "tm:haze",
-        "tm:helpinghand",
-        "tm:hydrocannon",
-        "tm:hydropump",
-        "tm:hyperbeam",
-        "tm:icebeam",
-        "tm:icepunch",
-        "tm:icywind",
-        "tm:lick",
-        "tm:liquidation",
-        "tm:lowkick",
-        "tm:lowsweep",
-        "tm:matblock",
-        "tm:mudshot",
-        "tm:mudslap",
-        "tm:nightslash",
-        "tm:pound",
-        "tm:protect",
-        "tm:quickattack",
-        "tm:raindance",
-        "tm:rest",
-        "tm:retaliate",
-        "tm:rockslide",
-        "tm:rocktomb",
-        "tm:roleplay",
-        "tm:shadowsneak",
-        "tm:sleeptalk",
-        "tm:sludgewave",
-        "tm:smackdown",
-        "tm:smokescreen",
-        "tm:snatch",
-        "tm:snowscape",
-        "tm:spikes",
-        "tm:substitute",
-        "tm:surf",
-        "tm:swift",
-        "tm:switcheroo",
-        "tm:swordsdance",
-        "tm:takedown",
-        "tm:taunt",
-        "tm:terablast",
-        "tm:thief",
-        "tm:toxicspikes",
-        "tm:trailblaze",
-        "tm:upperhand",
-        "tm:uturn",
-        "tm:waterfall",
-        "tm:watergun",
-        "tm:waterpledge",
-        "tm:waterpulse",
-        "tm:watershuriken",
-        "tm:weatherball",
-        "tm:workup"
+        "undiscovered"
       ],
       "evolutions": [],
       "battleOnly": false
@@ -346,8 +246,7 @@
         "h:battlebond"
       ],
       "eggGroups": [
-        "undiscovered",
-        "water_1"
+        "undiscovered"
       ],
       "baseStats": {
         "hp": 72,