Code Cleanup
Re-add tombstone while de duping, for now.