Removed broken validation