Modify the Rule Test and remove unnecesary code