Remove moc
Merge pull request #1489 from diizy/master

Remove moc