lots of refactoring regarding removal of already obsolete session file mechanism