killbill-aplcache

diff --git a/account/src/main/java/com/ning/billing/account/glue/DefaultAccountModule.java b/account/src/main/java/com/ning/billing/account/glue/DefaultAccountModule.java
index a02f146..c129ce7 100644
--- a/account/src/main/java/com/ning/billing/account/glue/DefaultAccountModule.java
+++ b/account/src/main/java/com/ning/billing/account/glue/DefaultAccountModule.java
@@ -26,7 +26,6 @@ import com.ning.billing.account.api.user.DefaultAccountUserApi;
 import com.ning.billing.account.dao.AccountDao;
 import com.ning.billing.account.dao.DefaultAccountDao;
 import com.ning.billing.glue.AccountModule;
-import com.ning.billing.util.glue.RealImplementation;
 import com.ning.billing.util.svcapi.account.AccountInternalApi;
 
 import com.google.inject.AbstractModule;
@@ -48,8 +47,6 @@ public class DefaultAccountModule extends AbstractModule implements AccountModul
 
     @Override
     public void installAccountUserApi() {
-        // STEPH_ENT should eliminate the RealImplementation if not nedded
-        bind(AccountUserApi.class).annotatedWith(RealImplementation.class).to(DefaultAccountUserApi.class).asEagerSingleton();
         bind(AccountUserApi.class).to(DefaultAccountUserApi.class).asEagerSingleton();
     }
 

diff --git a/account/src/test/java/com/ning/billing/account/AccountTestSuiteNoDB.java b/account/src/test/java/com/ning/billing/account/AccountTestSuiteNoDB.java
index 2323d2b..ab2adba 100644
--- a/account/src/test/java/com/ning/billing/account/AccountTestSuiteNoDB.java
+++ b/account/src/test/java/com/ning/billing/account/AccountTestSuiteNoDB.java
@@ -25,12 +25,11 @@ import com.ning.billing.account.api.AccountUserApi;
 import com.ning.billing.account.dao.AccountDao;
 import com.ning.billing.account.glue.TestAccountModuleNoDB;
 import com.ning.billing.bus.api.PersistentBus;
+import com.ning.billing.clock.Clock;
 import com.ning.billing.util.audit.dao.AuditDao;
 import com.ning.billing.util.cache.CacheControllerDispatcher;
-import com.ning.billing.clock.Clock;
 import com.ning.billing.util.customfield.dao.CustomFieldDao;
 import com.ning.billing.util.dao.NonEntityDao;
-import com.ning.billing.util.glue.RealImplementation;
 import com.ning.billing.util.tag.api.user.TagEventBuilder;
 import com.ning.billing.util.tag.dao.TagDao;
 import com.ning.billing.util.tag.dao.TagDefinitionDao;
@@ -44,7 +43,6 @@ public abstract class AccountTestSuiteNoDB extends GuicyKillbillTestSuiteNoDB {
     @Inject
     protected AccountDao accountDao;
     @Inject
-    @RealImplementation
     protected AccountUserApi accountUserApi;
     @Inject
     protected AuditDao auditDao;

diff --git a/account/src/test/java/com/ning/billing/account/AccountTestSuiteWithEmbeddedDB.java b/account/src/test/java/com/ning/billing/account/AccountTestSuiteWithEmbeddedDB.java
index b6350c1..1e97f1f 100644
--- a/account/src/test/java/com/ning/billing/account/AccountTestSuiteWithEmbeddedDB.java
+++ b/account/src/test/java/com/ning/billing/account/AccountTestSuiteWithEmbeddedDB.java
@@ -25,12 +25,11 @@ import com.ning.billing.account.api.AccountUserApi;
 import com.ning.billing.account.dao.AccountDao;
 import com.ning.billing.account.glue.TestAccountModuleWithEmbeddedDB;
 import com.ning.billing.bus.api.PersistentBus;
+import com.ning.billing.clock.Clock;
 import com.ning.billing.util.audit.dao.AuditDao;
 import com.ning.billing.util.cache.CacheControllerDispatcher;
-import com.ning.billing.clock.Clock;
 import com.ning.billing.util.customfield.dao.CustomFieldDao;
 import com.ning.billing.util.dao.NonEntityDao;
-import com.ning.billing.util.glue.RealImplementation;
 import com.ning.billing.util.tag.api.user.TagEventBuilder;
 import com.ning.billing.util.tag.dao.TagDao;
 import com.ning.billing.util.tag.dao.TagDefinitionDao;
@@ -44,7 +43,6 @@ public abstract class AccountTestSuiteWithEmbeddedDB extends GuicyKillbillTestSu
     @Inject
     protected AccountDao accountDao;
     @Inject
-    @RealImplementation
     protected AccountUserApi accountUserApi;
     @Inject
     protected AuditDao auditDao;

diff --git a/util/src/test/java/com/ning/billing/mock/glue/MockAccountModule.java b/util/src/test/java/com/ning/billing/mock/glue/MockAccountModule.java
index b410bd7..e4369bb 100644
--- a/util/src/test/java/com/ning/billing/mock/glue/MockAccountModule.java
+++ b/util/src/test/java/com/ning/billing/mock/glue/MockAccountModule.java
@@ -13,13 +13,13 @@
  * License for the specific language governing permissions and limitations
  * under the License.
  */
+
 package com.ning.billing.mock.glue;
 
 import org.mockito.Mockito;
 
 import com.ning.billing.account.api.AccountUserApi;
 import com.ning.billing.glue.AccountModule;
-import com.ning.billing.util.glue.RealImplementation;
 import com.ning.billing.util.svcapi.account.AccountInternalApi;
 
 import com.google.inject.AbstractModule;
@@ -35,8 +35,6 @@ public class MockAccountModule extends AbstractModule implements AccountModule {
 
     @Override
     public void installAccountUserApi() {
-        // STEPH_ENT RealImplementation for accountUserApi
-        bind(AccountUserApi.class).annotatedWith(RealImplementation.class).toInstance(Mockito.mock(AccountUserApi.class));
         bind(AccountUserApi.class).toInstance(Mockito.mock(AccountUserApi.class));
     }