cleanup, add session management