some further cleanup of the alternative selector