Removed extraneous check