More file filter cleanup