MOBILE-427 Refactor wsSync