revert revert A few more removals

Change-Id: Ie412c7468356d1bf4e67663998af593fa7873fe3 (reverted from commit 7e199fc62995c69c61f0d3c705abecd81e5b9f67) (reverted from commit ce530c795155f1958824a29eab65336fb6988a24)