Need to fix origin detection removal