Govt to end non-filer category