Removed most usages of hidden APIs