A few more removals

Change-Id: Ie412c7468356d1bf4e67663998af593fa7873fe3