Remove checking