small changes, removed out of date code in session