Remove unused constraint, prepare for ctor text