Remove unused bits

This is reduced to only what's used by the platform. If any unbundled
branches need things other than this, they should be using their own
branch.

Bug: 244341573
Change-Id: Ic077ae2320661d1221614ba58db1cbd194edfa03