removed some reduant checks