Remove commented code. The session scoped stuff can be added back later when it will work.