Review and changes from Jocelyn Fiat

either remove all those output instruction, or use debug clauses
since it is not expected to have any output for such library class.