Free more memory in constraints cleanup