CE-26 Messages corrections
Fix and comments for broken and unused job