Cleanup of work with Affiliation and Metadata extensions.