removed unnecessary request calls via WS