Removed jigglypuff-specific stuff