Remove final db session leaks