===> Cleaning for advancecomp-2.6