Fix Loops after Session refactoring
minor clean up