final 2.0.6 preparation (get rid of some debug stuff)