Rename fields, remove WMO:06477