Removed the userId and related code which was a big distraction
Other cleanups to support presentation
Refinement for presentation