Update removes

Change-Id: Ifba34915b9e763beb7c8c285a5d7c6bc300b90c8