Major Code cleanup around partial reverts & cherry-picks