WB clean up