WIP: refactoring session delete