add back removal of kernel/msm