Remove more removals

Change-Id: Iefc216bc54a0abe3938656f5e91c7bd0cad8e3df