This will clean up Water World. It is slow, but it works better than not using it.
First, DESTROY THE COMMAND BLOCK CONTRAPTION FOR WATER WORLD!
To make the process faster, fly around and spawn in some entities, as they will help clean up. Ghasts are a good choice for this.