Fixed issue: Cleanup validation messages