remove ugly MC code