Get rid of old collection selector