Yes, and I removed/changed references to `Session` in the module as well for the same reason.