changes: ws cleanups