WS cleanups.