updated delete and end of session cases