Fixing the pokémon menu, cleanup