PDI-11140 - Cleaned up messages