Cleans up tcr-noblock branch.