chore: Remove remaining proxy cruft

Finishing up the removal of the deprecated proxy stuff.

Change-Id: I48f2dc3f382bc882b2e006c17438301c6ee92df9
Merge "chore: Remove remaining proxy cruft"