remove old WS stuff