DMaaP MR CSIT cleanup