Remove some extraneous checks