Merge "Remove another batch of Support_PortManager cruft."