Cleanup some more filters