further cleanup EqType