Removed references to Session