097f9a34a2
* Removes dead code * Prefixes internal functions with underscore * Removes a few one-off functions in favor of inlining Change-Id: Ic2f8c2e512df270f3b1b0e35ded98832a5152c72