refactoring, and moving to sync client (faster, simpler, more reliable)