Removed more validation that is unneeded