Decruft more, remove unused selectors.