More code cleanup
More cleanup; get rid of some ext-sync stuff
get rid of mtc.h/cpp, more cleanup