CM remove some unused imports