Review and changes from Jocelyn Fiat

remove this function ... unused, useless (and wrong)