Remove MSM stuff