Refactored solution and document to remove session