Merge "Delete Database before removing from list"