Remove old unneeded error checking