(chore) cleanup to switch to two-branched setup