Remove obsolete faces
Add missing group and version keywords