Got rid of old filtering mechanisms