Revert "[WIP] Enable user to set up a second UPF"

This reverts commit a9396a6de7d2e6e379fda45757193778feb99921.

Reason for revert: Andy is still working on it

Change-Id: Idb17a124009e12967c165d63abc660a8eb38d68f
4 files changed