Remove broken filters
Small code clean up