Removed mockito references. Updated so that proguard works.