Commenting out msm stuff