deprecate internal variable and remove references to it