Remove most of the filter code