Merge "Remove removed message keys from maintenance files"