Move clone flags detection to a more logical place