Majorly dirty source tree, clean up