Remove non-standard tags. Better support for 'file' kind