Cleanup session code
Merge pull request #99 from wilsonge/development

Cleanup session code