Flipping switches, removing unneeded validation.