reverting few debug stuff
additional cc for mailing test