Remove unpopulated fields

Format per kavi