Remove remaining DBG_CTOR etc. remnants from chart2

Change-Id: Iaf07f77b4228d4debb2620625b14ce7dc41e3a98