Took out unnecessary validation check