AddressMetadataRepository cleanups.