RHS clean up