diff --git a/samples/client/petstore/objc/client/NIKCategory.m b/samples/client/petstore/objc/client/NIKCategory.m
index 52c7990391ae..78cd4ff79156 100644
--- a/samples/client/petstore/objc/client/NIKCategory.m
+++ b/samples/client/petstore/objc/client/NIKCategory.m
@@ -15,9 +15,7 @@
 
 - (id) initWithValues: (NSDictionary*)dict
 {
-    /* isContainer: , baseType: NSNumber, complexType:  */
     __id = [dict objectForKey:@"id"];
-    /* isContainer: , baseType: NSString, complexType:  */
     _name = [dict objectForKey:@"name"];
     return self;
 }
diff --git a/samples/client/petstore/objc/client/NIKOrder.m b/samples/client/petstore/objc/client/NIKOrder.m
index 8024915e3b79..ae36e534d6b7 100644
--- a/samples/client/petstore/objc/client/NIKOrder.m
+++ b/samples/client/petstore/objc/client/NIKOrder.m
@@ -24,15 +24,10 @@
 
 - (id) initWithValues: (NSDictionary*)dict
 {
-    /* isContainer: , baseType: NSNumber, complexType:  */
     __id = [dict objectForKey:@"id"];
-    /* isContainer: , baseType: NSNumber, complexType:  */
     _petId = [dict objectForKey:@"petId"];
-    /* isContainer: , baseType: NSString, complexType:  */
     _status = [dict objectForKey:@"status"];
-    /* isContainer: , baseType: NSNumber, complexType:  */
     _quantity = [dict objectForKey:@"quantity"];
-    /* isContainer: , baseType: NIKDate, complexType: NIKDate */
     id shipDate_dict = [dict objectForKey:@"shipDate"];
     _shipDate = [[NIKDate alloc]initWithValues:shipDate_dict];
     return self;
diff --git a/samples/client/petstore/objc/client/NIKPet.m b/samples/client/petstore/objc/client/NIKPet.m
index 2d8fb47ff046..26781b5edf08 100644
--- a/samples/client/petstore/objc/client/NIKPet.m
+++ b/samples/client/petstore/objc/client/NIKPet.m
@@ -27,9 +27,7 @@
 
 - (id) initWithValues: (NSDictionary*)dict
 {
-    /* isContainer: , baseType: NSNumber, complexType:  */
     __id = [dict objectForKey:@"id"];
-    /* isContainer: true, baseType: Tag, complexType: NIKTag */
     id tags_dict = [dict objectForKey:@"tags"];
     if([tags_dict isKindOfClass:[NSArray class]]) {
         if([(NSArray*)tags_dict count] > 0) {
@@ -41,14 +39,10 @@
             _tags = [[NSArray alloc] initWithArray:objs];
         }
     }
-    /* isContainer: , baseType: Category, complexType: NIKCategory */
     id category_dict = [dict objectForKey:@"category"];
     _category = [[NIKCategory alloc]initWithValues:category_dict];
-    /* isContainer: , baseType: NSString, complexType:  */
     _status = [dict objectForKey:@"status"];
-    /* isContainer: , baseType: NSString, complexType:  */
     _name = [dict objectForKey:@"name"];
-    /* isContainer: true, baseType: NSString, complexType:  */
     _photoUrls = [dict objectForKey:@"photoUrls"];
     return self;
 }
diff --git a/samples/client/petstore/objc/client/NIKPetApi.m b/samples/client/petstore/objc/client/NIKPetApi.m
index 3a0a760f6805..7a6cea8a1c2f 100644
--- a/samples/client/petstore/objc/client/NIKPetApi.m
+++ b/samples/client/petstore/objc/client/NIKPetApi.m
@@ -45,7 +45,6 @@ static NSString * basePath = @"http://petstore.swagger.wordnik.com/api";
         if(petId == nil) {
         // error
     }
-    // not a return container
     [_api dictionaryWithCompletionBlock: requestUrl 
                                  method: @"GET" 
                             queryParams: queryParams 
@@ -104,7 +103,6 @@ static NSString * basePath = @"http://petstore.swagger.wordnik.com/api";
     if(body == nil) {
         // error
     }
-    // not a return container
     [_api stringWithCompletionBlock: requestUrl 
                              method: @"POST" 
                         queryParams: queryParams 
@@ -164,7 +162,6 @@ static NSString * basePath = @"http://petstore.swagger.wordnik.com/api";
     if(body == nil) {
         // error
     }
-    // not a return container
     [_api stringWithCompletionBlock: requestUrl 
                              method: @"PUT" 
                         queryParams: queryParams 
@@ -204,7 +201,6 @@ static NSString * basePath = @"http://petstore.swagger.wordnik.com/api";
         if(status == nil) {
         // error
     }
-    // it's a returnContainer
     [_api dictionaryWithCompletionBlock: requestUrl 
                                  method: @"GET" 
                             queryParams: queryParams 
@@ -251,7 +247,6 @@ static NSString * basePath = @"http://petstore.swagger.wordnik.com/api";
         if(tags == nil) {
         // error
     }
-    // it's a returnContainer
     [_api dictionaryWithCompletionBlock: requestUrl 
                                  method: @"GET" 
                             queryParams: queryParams 
diff --git a/samples/client/petstore/objc/client/NIKStoreApi.m b/samples/client/petstore/objc/client/NIKStoreApi.m
index 4fdfdcca1da2..2a393727da5f 100644
--- a/samples/client/petstore/objc/client/NIKStoreApi.m
+++ b/samples/client/petstore/objc/client/NIKStoreApi.m
@@ -45,7 +45,6 @@ static NSString * basePath = @"http://petstore.swagger.wordnik.com/api";
         if(orderId == nil) {
         // error
     }
-    // not a return container
     [_api dictionaryWithCompletionBlock: requestUrl 
                                  method: @"GET" 
                             queryParams: queryParams 
@@ -83,7 +82,6 @@ static NSString * basePath = @"http://petstore.swagger.wordnik.com/api";
         if(orderId == nil) {
         // error
     }
-    // not a return container
     [_api stringWithCompletionBlock: requestUrl 
                              method: @"DELETE" 
                         queryParams: queryParams 
@@ -143,7 +141,6 @@ static NSString * basePath = @"http://petstore.swagger.wordnik.com/api";
     if(body == nil) {
         // error
     }
-    // not a return container
     [_api stringWithCompletionBlock: requestUrl 
                              method: @"POST" 
                         queryParams: queryParams 
diff --git a/samples/client/petstore/objc/client/NIKTag.m b/samples/client/petstore/objc/client/NIKTag.m
index 51b38a786441..450e16d109e3 100644
--- a/samples/client/petstore/objc/client/NIKTag.m
+++ b/samples/client/petstore/objc/client/NIKTag.m
@@ -15,9 +15,7 @@
 
 - (id) initWithValues: (NSDictionary*)dict
 {
-    /* isContainer: , baseType: NSNumber, complexType:  */
     __id = [dict objectForKey:@"id"];
-    /* isContainer: , baseType: NSString, complexType:  */
     _name = [dict objectForKey:@"name"];
     return self;
 }
diff --git a/samples/client/petstore/objc/client/NIKUser.m b/samples/client/petstore/objc/client/NIKUser.m
index 5e6a393e0a44..8943eb7d8bbb 100644
--- a/samples/client/petstore/objc/client/NIKUser.m
+++ b/samples/client/petstore/objc/client/NIKUser.m
@@ -33,21 +33,13 @@
 
 - (id) initWithValues: (NSDictionary*)dict
 {
-    /* isContainer: , baseType: NSNumber, complexType:  */
     __id = [dict objectForKey:@"id"];
-    /* isContainer: , baseType: NSString, complexType:  */
     _lastName = [dict objectForKey:@"lastName"];
-    /* isContainer: , baseType: NSString, complexType:  */
     _username = [dict objectForKey:@"username"];
-    /* isContainer: , baseType: NSString, complexType:  */
     _phone = [dict objectForKey:@"phone"];
-    /* isContainer: , baseType: NSString, complexType:  */
     _email = [dict objectForKey:@"email"];
-    /* isContainer: , baseType: NSNumber, complexType:  */
     _userStatus = [dict objectForKey:@"userStatus"];
-    /* isContainer: , baseType: NSString, complexType:  */
     _firstName = [dict objectForKey:@"firstName"];
-    /* isContainer: , baseType: NSString, complexType:  */
     _password = [dict objectForKey:@"password"];
     return self;
 }
diff --git a/samples/client/petstore/objc/client/NIKUserApi.m b/samples/client/petstore/objc/client/NIKUserApi.m
index 98ac2a772899..3fb0ee33b6c5 100644
--- a/samples/client/petstore/objc/client/NIKUserApi.m
+++ b/samples/client/petstore/objc/client/NIKUserApi.m
@@ -66,7 +66,6 @@ static NSString * basePath = @"http://petstore.swagger.wordnik.com/api";
     if(body == nil) {
         // error
     }
-    // not a return container
     [_api stringWithCompletionBlock: requestUrl 
                              method: @"POST" 
                         queryParams: queryParams 
@@ -126,7 +125,6 @@ static NSString * basePath = @"http://petstore.swagger.wordnik.com/api";
     if(body == nil) {
         // error
     }
-    // not a return container
     [_api stringWithCompletionBlock: requestUrl 
                              method: @"POST" 
                         queryParams: queryParams 
@@ -186,7 +184,6 @@ static NSString * basePath = @"http://petstore.swagger.wordnik.com/api";
     if(body == nil) {
         // error
     }
-    // not a return container
     [_api stringWithCompletionBlock: requestUrl 
                              method: @"POST" 
                         queryParams: queryParams 
@@ -250,7 +247,6 @@ static NSString * basePath = @"http://petstore.swagger.wordnik.com/api";
     if(body == nil) {
         // error
     }
-    // not a return container
     [_api stringWithCompletionBlock: requestUrl 
                              method: @"PUT" 
                         queryParams: queryParams 
@@ -289,7 +285,6 @@ static NSString * basePath = @"http://petstore.swagger.wordnik.com/api";
         if(username == nil) {
         // error
     }
-    // not a return container
     [_api stringWithCompletionBlock: requestUrl 
                              method: @"DELETE" 
                         queryParams: queryParams 
@@ -328,7 +323,6 @@ static NSString * basePath = @"http://petstore.swagger.wordnik.com/api";
         if(username == nil) {
         // error
     }
-    // not a return container
     [_api dictionaryWithCompletionBlock: requestUrl 
                                  method: @"GET" 
                             queryParams: queryParams 
@@ -372,8 +366,6 @@ static NSString * basePath = @"http://petstore.swagger.wordnik.com/api";
     if(password == nil) {
         // error
     }
-    // not a return container
-    // not an array, need to get json string as response
     [_api stringWithCompletionBlock: requestUrl 
                              method: @"GET" 
                         queryParams: queryParams 
@@ -420,8 +412,7 @@ static NSString * basePath = @"http://petstore.swagger.wordnik.com/api";
     NSMutableDictionary* queryParams = [[NSMutableDictionary alloc] init];
     NSMutableDictionary* headerParams = [[NSMutableDictionary alloc] init];
     id bodyDictionary = nil;
-        // not a return container
-    [_api stringWithCompletionBlock: requestUrl 
+        [_api stringWithCompletionBlock: requestUrl 
                              method: @"GET" 
                         queryParams: queryParams 
                                body: bodyDictionary