More WS clean up