more cleanup of for selector.