Strip 2.0 APIs from the 1.5 branch.