Remove MSM stuff
Merge pull request #1 from stefanopanella/master

Remove MSM stuff