Remove suffix support. Handled by locators.