Cleaning up wave system