Add check for  host before syncing on remove