Remove last use of global kernelselector