mono/mono — pull request #1375 by echampet (2014-10-28 14:37:17+00:00)
Title: (big) cleanup

Hi,
Keeping old code and file around isn't helping mono,
so here some (agressive) cleanup :)