Session object refactoring - code cleanup needs to happen now