Cleaned up Selector.

Removed staticmethods.