Review and changes from Jocelyn Fiat

remove those lines, or put them under "debug" clauses