jf-common: remove CM parts