again removing some cm customizations