Removed dependency on constraints. We no longer use it