(big) cleanup

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