Cleaned up selector methods.

Session is no longer passed around.