CB-1882 Refactor to not implement updateConstraints