Remove some debug clauses