remove UI specific checking