And removed all "if verbose" statements?