I think we should go ahead and remove this, unless you feel strongly otherwise -- no reason to have extra code here that will never be used.