WS cleanup