Cleanup more filters for array and enumerable