more cleanup
added session