am c0b52fef: Refactoring to ensure item deletion always removes from the DB.

* commit 'c0b52fefbc11531d560359c093484099f9d1298e':
  Refactoring to ensure item deletion always removes from the DB.