Client side: Removed unused selectors