Consolidate list refresh and deletion

Change-Id: I024dbc3f9d18ae0c762c5fd1c54855afe6d54050
4 files changed