Further cleanup.
Refactored WS call to util class.