Drop the core-selector values idea