an upgrade fix and further pubIds porting

Dead code