Cleanup session a bit