Update removes

Change-Id: Ibffbe56510d9b9a90142ec81d623a9295a0b9eff