Remove old cm derp

(cherry picked from commit 729b59724702f72558ac0c09cd4efe77ded2c2b4)