Remove dependency on threadfilter feature