remove ugly MC code
Merge pull request #1502 from dongzha/RemoveUglyCode

remove ugly MC code