SYNC-1229 Remove redundant logic