CS Selector Cleanup