Remove selector specific instance functionality; will put in separate factory