removed remaining session code that was no longer implemented
some formatting changes