Index: Src/GoogleApis.Tools.CodeGen/Decorator/SchemaDecorator/StandardPropertyFieldDecorator.cs
===================================================================
deleted file mode 100644
--- a/Src/GoogleApis.Tools.CodeGen/Decorator/SchemaDecorator/StandardPropertyFieldDecorator.cs
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
-Copyright 2010 Google Inc
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-using System.CodeDom;
-using System.Collections.Generic;
-using System.Linq;
-using Google.Apis.Discovery.Schema;
-using Google.Apis.Logging;
-using Google.Apis.Testing;
-using Google.Apis.Tools.CodeGen.Generator;
-using Google.Apis.Util;
-using Newtonsoft.Json.Schema;
-
-namespace Google.Apis.Tools.CodeGen.Decorator.SchemaDecorator
-{
-    /// <summary>
-    /// Decorator for standard property fields
-    /// </summary>
-    public class StandardPropertyFieldDecorator : ISchemaDecorator, INestedClassSchemaDecorator
-    {
-        private static readonly ILogger logger = ApplicationContext.Logger.ForType<StandardPropertyFieldDecorator>();
-
-        #region INestedClassSchemaDecorator Members
-
-        public void DecorateInternalClass(CodeTypeDeclaration typeDeclaration,
-                                          string name,
-                                          JsonSchema schema,
-                                          IDictionary<JsonSchema, SchemaImplementationDetails> implDetails,
-                                          INestedClassProvider internalClassProvider)
-        {
-            typeDeclaration.ThrowIfNull("typeDeclaration");
-            schema.ThrowIfNull("schema");
-            implDetails.ThrowIfNull("details");
-            internalClassProvider.ThrowIfNull("internalClassProvider");
-            typeDeclaration.Members.AddRange(
-                GenerateAllFields(name, schema, implDetails, internalClassProvider).ToArray());
-        }
-
-        #endregion
-
-        #region ISchemaDecorator Members
-
-        public void DecorateClass(CodeTypeDeclaration typeDeclaration,
-                                  ISchema schema,
-                                  IDictionary<JsonSchema, SchemaImplementationDetails> implDetails,
-                                  INestedClassProvider internalClassProvider)
-        {
-            typeDeclaration.ThrowIfNull("typeDeclaration");
-            schema.ThrowIfNull("schema");
-            implDetails.ThrowIfNull("details");
-            internalClassProvider.ThrowIfNull("internalClassProvider");
-            typeDeclaration.Members.AddRange(
-                GenerateAllFields(schema.Name, schema.SchemaDetails, implDetails, internalClassProvider).ToArray());
-        }
-
-        #endregion
-
-        [VisibleForTestOnly]
-        internal IList<CodeMemberField> GenerateAllFields(string name,
-                                                          JsonSchema schema,
-                                                          IDictionary<JsonSchema, SchemaImplementationDetails>
-                                                              implDetails,
-                                                          INestedClassProvider internalClassProvider)
-        {
-            schema.ThrowIfNull("schema");
-            name.ThrowIfNull("name");
-            implDetails.ThrowIfNull("details");
-            internalClassProvider.ThrowIfNull("internalClassProvider");
-
-            var fields = new List<CodeMemberField>();
-            if (schema.Properties.IsNullOrEmpty())
-            {
-                logger.Debug("No Properties found for " + name);
-                return fields;
-            }
-
-            int index = 0;
-            foreach (var propertyPair in schema.Properties)
-            {
-                SchemaImplementationDetails details = implDetails[propertyPair.Value];
-
-                fields.Add(
-                    GenerateField(
-                        propertyPair.Key, propertyPair.Value, details, index, internalClassProvider,
-                        schema.Properties.Keys.Without(propertyPair.Key)));
-                index++;
-            }
-            return fields;
-        }
-
-        [VisibleForTestOnly]
-        internal CodeMemberField GenerateField(string name,
-                                               JsonSchema propertySchema,
-                                               SchemaImplementationDetails details,
-                                               int index,
-                                               INestedClassProvider internalClassProvider,
-                                               IEnumerable<string> otherFieldNames)
-        {
-            name.ThrowIfNullOrEmpty("name");
-            propertySchema.ThrowIfNull("propertySchema");
-            internalClassProvider.ThrowIfNull("internalClassProvider");
-            details.ThrowIfNull("details");
-
-            var ret = new CodeMemberField(
-                SchemaDecoratorUtil.GetCodeType(propertySchema, details, internalClassProvider),
-                SchemaDecoratorUtil.GetFieldName(name, otherFieldNames));
-            ret.Attributes = MemberAttributes.Private;
-
-            return ret;
-        }
-    }
-}
\ No newline at end of file