remove some security check