Now removes waves when they are done and empty