Old main patch removed
Various cleanup
Big changes