Move global remove handling out of UWU

Change-Id: Ia55139d9cf9bdb96bdddcfa7acabf7491af5ebf5