Clean up with bed creation and rock water diversion