HHH-8893 cleanup