[PDI-9314] Minor cleanup