Took out some unneeded validation stuff