fix: add session.remove() and engine.dispose() to all DB retry paths

fix: add session.remove() and engine.dispose() to all DB retry paths #1460