Remove unneeded validation