Clean up, trying to implement long-polling for sync listing