diff --git a/utils/yangutils/plugin/src/main/java/org/onosproject/yangutils/translator/tojava/javamodel/YangJavaAugment.java b/utils/yangutils/plugin/src/main/java/org/onosproject/yangutils/translator/tojava/javamodel/YangJavaAugment.java
index a890ec2..9986351 100644
--- a/utils/yangutils/plugin/src/main/java/org/onosproject/yangutils/translator/tojava/javamodel/YangJavaAugment.java
+++ b/utils/yangutils/plugin/src/main/java/org/onosproject/yangutils/translator/tojava/javamodel/YangJavaAugment.java
@@ -16,23 +16,17 @@
 package org.onosproject.yangutils.translator.tojava.javamodel;
 
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
 
 import org.onosproject.yangutils.datamodel.YangAugment;
-import org.onosproject.yangutils.datamodel.YangNodeIdentifier;
 import org.onosproject.yangutils.translator.exception.TranslatorException;
 import org.onosproject.yangutils.translator.tojava.JavaCodeGenerator;
 import org.onosproject.yangutils.translator.tojava.JavaCodeGeneratorInfo;
 import org.onosproject.yangutils.translator.tojava.JavaFileInfo;
-import org.onosproject.yangutils.translator.tojava.JavaQualifiedTypeInfo;
 import org.onosproject.yangutils.translator.tojava.TempJavaCodeFragmentFiles;
 import org.onosproject.yangutils.utils.io.impl.YangPluginConfig;
 
 import static org.onosproject.yangutils.translator.tojava.GeneratedJavaFileType.GENERATE_INTERFACE_WITH_BUILDER;
 import static org.onosproject.yangutils.translator.tojava.YangJavaModelUtils.generateCodeOfAugmentableNode;
-import static org.onosproject.yangutils.utils.io.impl.YangIoUtils.getCamelCase;
-import static org.onosproject.yangutils.utils.io.impl.YangIoUtils.getCapitalCase;
 
 /**
  * Represents augment information extended to support java code generation.
@@ -44,23 +38,12 @@
     private static final long serialVersionUID = 806201632L;
 
     /**
-     * Prefix to be added to generated java file for augment node.
-     */
-    private static final String AUGMENTED = "Augmented";
-
-    /**
      * Contains the information of the java file being generated.
      */
     private JavaFileInfo javaFileInfo;
 
     /**
-     * TargetNodes java qualified info.
-     */
-    private List<JavaQualifiedTypeInfo> extendedClassInfo;
-
-    /**
-     * File handle to maintain temporary java code fragments as per the code
-     * snippet types.
+     * File handle to maintain temporary java code fragments as per the code snippet types.
      */
     private transient TempJavaCodeFragmentFiles tempFileHandle;
 
@@ -70,7 +53,6 @@
     public YangJavaAugment() {
         super();
         setJavaFileInfo(new JavaFileInfo());
-        setExtendedClassInfo(new ArrayList<>());
         getJavaFileInfo().setGeneratedFileTypes(GENERATE_INTERFACE_WITH_BUILDER);
     }
 
@@ -119,8 +101,7 @@
     }
 
     /**
-     * Prepare the information for java code generation corresponding to YANG
-     * augment info.
+     * Prepare the information for java code generation corresponding to YANG augment info.
      *
      * @param yangPlugin YANG plugin config
      * @throws TranslatorException translator operation fail
@@ -148,46 +129,4 @@
         }
     }
 
-    /**
-     * Returns augment class name.
-     *
-     * @return augment class name
-     */
-    public String getAugmentClassName() {
-        YangNodeIdentifier nodeId = getTargetNode().get(getTargetNode().size() - 1).getNodeIdentifier();
-        String name = getCapitalCase(getCamelCase(nodeId.getName(), null));
-        if (nodeId.getPrefix() != null) {
-            return AUGMENTED + getCapitalCase(nodeId.getPrefix()) + name;
-        } else {
-            return AUGMENTED + name;
-        }
-    }
-
-    /**
-     * Returns extended class info.
-     *
-     * @return extended class info
-     */
-    public List<JavaQualifiedTypeInfo> getExtendedClassInfo() {
-        return extendedClassInfo;
-    }
-
-    /**
-     * Sets extended class info.
-     *
-     * @param augmentedInfo extended class info
-     */
-    private void setExtendedClassInfo(List<JavaQualifiedTypeInfo> augmentedInfo) {
-        extendedClassInfo = augmentedInfo;
-    }
-
-    /**
-     * Adds to extended class info list.
-     *
-     * @param augmentedInfo extended class info
-     */
-    public void addToExtendedClassInfo(JavaQualifiedTypeInfo augmentedInfo) {
-        getExtendedClassInfo().add(augmentedInfo);
-    }
-
 }
