Remove explicit reference usage