#32 GIBS-620 Clean up of messages for subdaily support