[DCAE] Add Kohn branch and cleanup older branches