Cleaned up Usings in MetadataContexts