delete/update

Change-Id: Ia393c121b59d47da92d206ce6604f4aa53938a79