AS7-6607: removal of cmp subsystem