session stuff and removed unneeded comments