Remove explicit references to keys