Remove extra error checking