HIVE-8834-norefac: clean up