diff --git a/zanata-model/src/main/java/org/zanata/model/HLocale.java b/zanata-model/src/main/java/org/zanata/model/HLocale.java
index 76e2edea1d..9e06544eb5 100644
--- a/zanata-model/src/main/java/org/zanata/model/HLocale.java
+++ b/zanata-model/src/main/java/org/zanata/model/HLocale.java
@@ -71,7 +71,6 @@ public HLocale(@Nonnull LocaleId localeId) {
         this.localeId = localeId;
     }
 
-    @VisibleForTesting
     public HLocale(@Nonnull LocaleId localeId, boolean enabledByDefault,
             boolean active) {
         this.localeId = localeId;
diff --git a/zanata-model/src/main/java/org/zanata/model/HTextFlow.java b/zanata-model/src/main/java/org/zanata/model/HTextFlow.java
index bfd22b676c..7972bda77f 100644
--- a/zanata-model/src/main/java/org/zanata/model/HTextFlow.java
+++ b/zanata-model/src/main/java/org/zanata/model/HTextFlow.java
@@ -33,7 +33,6 @@
 import javax.persistence.EntityListeners;
 import javax.persistence.FetchType;
 import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
@@ -47,7 +46,6 @@
 import javax.persistence.PostPersist;
 import javax.persistence.PostUpdate;
 import javax.persistence.PreUpdate;
-import javax.persistence.TableGenerator;
 import javax.persistence.Transient;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
diff --git a/zanata-model/src/main/java/org/zanata/util/ZanataEntities.java b/zanata-model/src/main/java/org/zanata/util/ZanataEntities.java
index fba546c626..77b718b5cd 100644
--- a/zanata-model/src/main/java/org/zanata/util/ZanataEntities.java
+++ b/zanata-model/src/main/java/org/zanata/util/ZanataEntities.java
@@ -60,7 +60,7 @@ public class ZanataEntities {
      * @return a list of entity classes that is in order for deletion i.e. won't
      *         violate referential constraint.
      */
-    public static List<Class> entitiesInOrderForDelete() {
+    public static List<Class> entitiesForRemoval() {
         if (entitiesForDelete != null) {
             return entitiesForDelete;
         }
diff --git a/zanata-war/src/test/java/org/zanata/ZanataJpaTest.java b/zanata-war/src/test/java/org/zanata/ZanataJpaTest.java
index 9ea72e5cfd..54374155f1 100644
--- a/zanata-war/src/test/java/org/zanata/ZanataJpaTest.java
+++ b/zanata-war/src/test/java/org/zanata/ZanataJpaTest.java
@@ -131,6 +131,6 @@ protected void clearHibernateSecondLevelCache() {
     }
 
     protected void deleteAllTables() {
-        deleteAll(getEm(), ZanataEntities.entitiesInOrderForDelete());
+        deleteAll(getEm(), ZanataEntities.entitiesForRemoval());
     }
 }
diff --git a/zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplPerformanceTest.java b/zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplPerformanceTest.java
index 48d0cb7d0b..157ef8d681 100644
--- a/zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplPerformanceTest.java
+++ b/zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplPerformanceTest.java
@@ -198,7 +198,7 @@ public void setUp() throws Exception {
 
         copyTransService = seam.autowire(CopyTransServiceImpl.class);
 
-        deleteAll(getEm(), ZanataEntities.entitiesInOrderForDelete());
+        deleteAll(getEm(), ZanataEntities.entitiesForRemoval());
 
         HLocale enUS = makeLocale(LocaleId.EN_US);
         HLocale de = makeLocale(LocaleId.DE);