diff --git a/src/main/java/net/tirasa/connid/bundles/googleapps/GoogleAppsCreate.java b/src/main/java/net/tirasa/connid/bundles/googleapps/GoogleAppsCreate.java
index 86bb105..d132c32 100644
--- a/src/main/java/net/tirasa/connid/bundles/googleapps/GoogleAppsCreate.java
+++ b/src/main/java/net/tirasa/connid/bundles/googleapps/GoogleAppsCreate.java
@@ -325,9 +325,7 @@ public Uid handleResult(
             });
         }
 
-        LOG.warn("Create of type {0} is not supported", configuration.getConnectorMessages()
-                .format(objectClass.getDisplayNameKey(), objectClass.getObjectClassValue()));
-        throw new UnsupportedOperationException("Create of type"
+        throw new UnsupportedOperationException("Create of type "
                 + objectClass.getObjectClassValue() + " is not supported");
     }
 }
diff --git a/src/main/java/net/tirasa/connid/bundles/googleapps/GoogleAppsUpdate.java b/src/main/java/net/tirasa/connid/bundles/googleapps/GoogleAppsUpdate.java
index 67b2ac7..94cbc86 100644
--- a/src/main/java/net/tirasa/connid/bundles/googleapps/GoogleAppsUpdate.java
+++ b/src/main/java/net/tirasa/connid/bundles/googleapps/GoogleAppsUpdate.java
@@ -573,9 +573,7 @@ public Uid handleResult(
                 });
             }
         } else {
-            LOG.warn("Update of type {0} is not supported", configuration.getConnectorMessages()
-                    .format(objectClass.getDisplayNameKey(), objectClass.getObjectClassValue()));
-            throw new UnsupportedOperationException("Update of type"
+            throw new UnsupportedOperationException("Update of type "
                     + objectClass.getObjectClassValue() + " is not supported");
         }
         return uidAfterUpdate;
@@ -890,7 +888,7 @@ public Uid handleResult(final Directory.Orgunits.Update request, final OrgUnit v
                 });
             }
         } else {
-            throw new UnsupportedOperationException("Update delta of type"
+            throw new UnsupportedOperationException("Update delta of type "
                     + objectClass.getObjectClassValue() + " is not supported");
         }
 
diff --git a/src/main/java/net/tirasa/connid/bundles/googleapps/GroupHandler.java b/src/main/java/net/tirasa/connid/bundles/googleapps/GroupHandler.java
index 84d5708..f440ab1 100644
--- a/src/main/java/net/tirasa/connid/bundles/googleapps/GroupHandler.java
+++ b/src/main/java/net/tirasa/connid/bundles/googleapps/GroupHandler.java
@@ -277,26 +277,6 @@ public StringBuilder visitEndsWithFilter(final Directory.Groups.List list, final
     //
     // /////////////
     public static ObjectClassInfo getObjectClassInfo() {
-        // @formatter:off
-        /* GROUP from https://devsite.googleplex.com/admin-sdk/directory/v1/reference/groups#resource
-         * {
-         * "kind": "admin#directory#group",
-         * "id": string,
-         * "etag": etag,
-         * "email": string,
-         * "name": string,
-         * "directMembersCount": long,
-         * "description": string,
-         * "adminCreated": boolean,
-         * "aliases": [
-         * string
-         * ],
-         * "nonEditableAliases": [
-         * string
-         * ]
-         * }
-         */
-        // @formatter:on
         ObjectClassInfoBuilder builder = new ObjectClassInfoBuilder();
         builder.setType(ObjectClass.GROUP_NAME);
         // email
diff --git a/src/main/java/net/tirasa/connid/bundles/googleapps/LicenseAssignmentsHandler.java b/src/main/java/net/tirasa/connid/bundles/googleapps/LicenseAssignmentsHandler.java
index c3571b2..e74a34d 100644
--- a/src/main/java/net/tirasa/connid/bundles/googleapps/LicenseAssignmentsHandler.java
+++ b/src/main/java/net/tirasa/connid/bundles/googleapps/LicenseAssignmentsHandler.java
@@ -71,18 +71,6 @@ public final class LicenseAssignmentsHandler {
     //
     // /////////////
     public static ObjectClassInfo getObjectClassInfo() {
-        // @formatter:off
-        /*
-         * {
-         * "kind": "licensing#licenseAssignment",
-         * "etags": etag,
-         * "selfLink": string,
-         * "userId": string,
-         * "productId": string,
-         * "skuId": string
-         * }
-         */
-        // @formatter:on
         ObjectClassInfoBuilder builder = new ObjectClassInfoBuilder();
         builder.setType(GoogleAppsUtil.LICENSE_ASSIGNMENT.getObjectClassValue());
         // productId
diff --git a/src/main/java/net/tirasa/connid/bundles/googleapps/MembersHandler.java b/src/main/java/net/tirasa/connid/bundles/googleapps/MembersHandler.java
index c80110c..57dc43a 100644
--- a/src/main/java/net/tirasa/connid/bundles/googleapps/MembersHandler.java
+++ b/src/main/java/net/tirasa/connid/bundles/googleapps/MembersHandler.java
@@ -51,12 +51,6 @@ public final class MembersHandler {
     private static final Log LOG = Log.getLog(MembersHandler.class);
 
     public static ObjectClassInfo getObjectClassInfo() {
-        // @formatter:off
-        /*
-         * {
-         * }
-         */
-        // @formatter:on
         ObjectClassInfoBuilder builder = new ObjectClassInfoBuilder();
         builder.setType(GoogleAppsUtil.MEMBER.getObjectClassValue());
         builder.addAttributeInfo(AttributeInfoBuilder.define(Name.NAME).setUpdateable(false).
diff --git a/src/main/java/net/tirasa/connid/bundles/googleapps/OrgunitsHandler.java b/src/main/java/net/tirasa/connid/bundles/googleapps/OrgunitsHandler.java
index 5318fb8..45d3a24 100644
--- a/src/main/java/net/tirasa/connid/bundles/googleapps/OrgunitsHandler.java
+++ b/src/main/java/net/tirasa/connid/bundles/googleapps/OrgunitsHandler.java
@@ -66,19 +66,6 @@ public final class OrgunitsHandler {
     //
     // /////////////
     public static ObjectClassInfo getObjectClassInfo() {
-        // @formatter:off
-        /*
-         * {
-         * "kind": "admin#directory#orgUnit",
-         * "etag": etag,
-         * "name": string,
-         * "description": string,
-         * "orgUnitPath": string,
-         * "parentOrgUnitPath": string,
-         * "blockInheritance": boolean
-         * }
-         */
-        // @formatter:on
         ObjectClassInfoBuilder builder = new ObjectClassInfoBuilder();
         builder.setType(GoogleAppsUtil.ORG_UNIT.getObjectClassValue());
         builder.setContainer(true);
diff --git a/src/main/java/net/tirasa/connid/bundles/googleapps/UserHandler.java b/src/main/java/net/tirasa/connid/bundles/googleapps/UserHandler.java
index 8fbc579..f816b2f 100644
--- a/src/main/java/net/tirasa/connid/bundles/googleapps/UserHandler.java
+++ b/src/main/java/net/tirasa/connid/bundles/googleapps/UserHandler.java
@@ -381,116 +381,6 @@ public StringBuilder visitEndsWithFilter(final Directory.Users.List list, final
     //
     // /////////////
     public static ObjectClassInfo getObjectClassInfo(final String customSchemasJSON) {
-        // @formatter:off
-        /*
-         * {
-         * "kind": "admin#directory#user",
-         * "id": string,
-         * "etag": etag,
-         * "primaryEmail": string,
-         * "name": {
-         * "givenName": string,
-         * "familyName": string,
-         * "fullName": string
-         * },
-         * "isAdmin": boolean,
-         * "isDelegatedAdmin": boolean,
-         * "lastLoginTime": datetime,
-         * "creationTime": datetime,
-         * "deletionTime": datetime,
-         * "agreedToTerms": boolean,
-         * "password": string,
-         * "hashFunction": string,
-         * "suspended": boolean,
-         * "suspensionReason": string,
-         * "changePasswordAtNextLogin": boolean,
-         * "ipWhitelisted": boolean,
-         * "ims": [
-         * {
-         * "type": string,
-         * "customType": string,
-         * "protocol": string,
-         * "customProtocol": string,
-         * "im": string,
-         * "primary": boolean
-         * }
-         * ],
-         * "emails": [
-         * {
-         * "address": string,
-         * "type": string,
-         * "customType": string,
-         * "primary": boolean
-         * }
-         * ],
-         * "externalIds": [
-         * {
-         * "value": string,
-         * "type": string,
-         * "customType": string
-         * }
-         * ],
-         * "relations": [
-         * {
-         * "value": string,
-         * "type": string,
-         * "customType": string
-         * }
-         * ],
-         * "addresses": [
-         * {
-         * "type": string,
-         * "customType": string,
-         * "sourceIsStructured": boolean,
-         * "formatted": string,
-         * "poBox": string,
-         * "extendedAddress": string,
-         * "streetAddress": string,
-         * "locality": string,
-         * "region": string,
-         * "postalCode": string,
-         * "country": string,
-         * "primary": boolean,
-         * "countryCode": string
-         * }
-         * ],
-         * "organizations": [
-         * {
-         * "name": string,
-         * "title": string,
-         * "primary": boolean,
-         * "type": string,
-         * "customType": string,
-         * "department": string,
-         * "symbol": string,
-         * "location": string,
-         * "description": string,
-         * "domain": string,
-         * "costCenter": string
-         * }
-         * ],
-         * "phones": [
-         * {
-         * "value": string,
-         * "primary": boolean,
-         * "type": string,
-         * "customType": string
-         * }
-         * ],
-         * "aliases": [
-         * string
-         * ],
-         * "nonEditableAliases": [
-         * string
-         * ],
-         * "customerId": string,
-         * "orgUnitPath": string,
-         * "isMailboxSetup": boolean,
-         * "includeInGlobalAddressList": boolean,
-         * "thumbnailPhotoUrl": string
-         * }
-         */
-        // @formatter:on
         ObjectClassInfoBuilder builder = new ObjectClassInfoBuilder();
 
         // primaryEmail