Constraints cleanup