[1652] [Task] Cleanup validation custom messages in models