Remove un-needed error checking to improve performance