Removed unnecessary constraints in framework