Fix remove selectors