Remove all blocking API and code from branch. No test changes.