Merge "Remove unused imports from Session classes"