A dog wagging his tail means he is happy. No need to get rid of such a pure and positive behavior.
You could put it on command like homer has mentioned. People will believe that your dog is understanding your words if you do! :dogsmile:
To put it on command, you can simply say "Wag!" followed with a click & treat, while he is wagging his tail. :dogbiggrin: