Remove unused db calls to fetch original metadata

Remove unnecessary db calls made to fetch
original metadata when delete flag is set
to True.

Closes-Bug: #1246291

Change-Id: If7483b8b21f71efa5e7c211b031170bc03eb6b9b
Merge "Remove unused db calls to fetch original metadata"
Merge commit '052e371285d54c3d32ecdfed328ac2841b95a83a' into HEAD