UPDATE: remove references to old functions