more reference removal