Merge "Cleanup Filter class"