Session management rework and installation clean up.