Surf, Strength, Waterfall and Fly can stay, all the other ones should be items that accomplish the same thing.
I guess just in case someone wants to use the moves for their own inscrutable reasons, you should have the option to use items for the effect or HMs. They also have no reason not to...