diff --git a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/services/RDLGrammarAccess.java b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/services/RDLGrammarAccess.java
index ae8d3bd..c37f764 100644
--- a/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/services/RDLGrammarAccess.java
+++ b/com.minres.rdl.parent/com.minres.rdl/src-gen/com/minres/rdl/services/RDLGrammarAccess.java
@@ -3,9 +3,8 @@
  */
 package com.minres.rdl.services;
 
-import com.google.inject.Inject;
-import com.google.inject.Singleton;
 import java.util.List;
+
 import org.eclipse.xtext.Action;
 import org.eclipse.xtext.Alternatives;
 import org.eclipse.xtext.Assignment;
@@ -19,10 +18,12 @@ import org.eclipse.xtext.Keyword;
 import org.eclipse.xtext.ParserRule;
 import org.eclipse.xtext.RuleCall;
 import org.eclipse.xtext.TerminalRule;
-import org.eclipse.xtext.service.AbstractElementFinder.AbstractEnumRuleElementFinder;
 import org.eclipse.xtext.service.AbstractElementFinder.AbstractGrammarElementFinder;
 import org.eclipse.xtext.service.GrammarProvider;
 
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
+
 @Singleton
 public class RDLGrammarAccess extends AbstractGrammarElementFinder {
 	
diff --git a/com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/generator/AddrmapGenerator.xtend b/com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/generator/AddrmapGenerator.xtend
index b7a8652..ac7ecc0 100644
--- a/com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/generator/AddrmapGenerator.xtend
+++ b/com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/generator/AddrmapGenerator.xtend
@@ -1,11 +1,7 @@
 package com.minres.rdl.generator
 
-import com.minres.rdl.generator.RdlBaseGenerator
 import com.minres.rdl.rdl.ComponentDefinition
-import com.minres.rdl.IntegerWithRadix
 import com.minres.rdl.rdl.ComponentDefinitionType
-import com.minres.rdl.rdl.ComponentInstance
-import com.minres.rdl.rdl.Instantiation
 
 import static extension com.minres.rdl.RdlUtil.*
 
diff --git a/com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/generator/RdlBaseGenerator.xtend b/com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/generator/RdlBaseGenerator.xtend
index 933afad..5343dd9 100644
--- a/com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/generator/RdlBaseGenerator.xtend
+++ b/com.minres.rdl.parent/com.minres.rdl/src/com/minres/rdl/generator/RdlBaseGenerator.xtend
@@ -1,17 +1,5 @@
 package com.minres.rdl.generator
 
-import com.minres.rdl.rdl.ComponentDefinition
-import com.minres.rdl.rdl.ExplicitPropertyAssignment
-import com.minres.rdl.rdl.PropertyAssignment
-import com.minres.rdl.rdl.PropertyEnum
-import com.minres.rdl.IntegerWithRadix
-import com.minres.rdl.rdl.Instantiation
-import com.minres.rdl.rdl.PropertyAssignmentRhs
-import com.minres.rdl.rdl.RValue
-import com.minres.rdl.rdl.RValueConstant
-import com.minres.rdl.rdl.InstancePropertyRef
-import com.minres.rdl.rdl.ComponentDefinitionType
-
 abstract class RdlBaseGenerator {
        
     def String generateHeader()