Adding session cleanup