Yes, removed it. See additional commits.