Remove some unneeded error checking