WS Spring Cleanup