Jf-common: remove CM stuff