diff --git a/config/android-quality.gradle b/config/android-quality.gradle
index d68e5070d..7a14dc4fb 100755
--- a/config/android-quality.gradle
+++ b/config/android-quality.gradle
@@ -1,5 +1,4 @@
 apply plugin: 'pmd'
-apply plugin: 'findbugs'
 apply plugin: 'checkstyle'
 
 def isTravis = "true".equals(System.getenv("TRAVIS"))
@@ -8,11 +7,6 @@ pmd {
   ruleSetFiles = files("${project.rootDir}/config/pmd/pmd-ruleset.xml")
 }
 
-findbugs {
-  includeFilter = file("${project.rootDir}/config/findbugs/findbugs-config.xml")
-  excludeFilter = file("${project.rootDir}/config/findbugs/findbugs-excludes.xml")
-}
-
 checkstyle {
   toolVersion = "7.1.1"
   showViolations isTravis
@@ -40,71 +34,8 @@ task pmd(type: Pmd) {
 }
 
 
-// Excludes based on https://github.com/ChaitanyaPramod/findbugs-android
-def androidDataBindingExcludes =
-    ['android/databinding/**/*.class',
-     '**/android/databinding/*Binding.class',
-     '**/BR.*'].asImmutable()
-
-def Collection<String> androidExcludes =
-    ['**/R.class',
-     '**/R$*.class',
-     '**/BuildConfig.*',
-     '**/Manifest*.*',
-     '**/*.bin'
-    ].asImmutable()
-
-def Collection<String> butterKnifeExcludes =
-    ['**/*$ViewInjector*.*',
-     '**/*$ViewBinder*.*'].asImmutable()
-
-def Collection<String> dagger2Excludes =
-    ['**/*_MembersInjector.class',
-     '**/Dagger*Component.class',
-     '**/Dagger*Component$Builder.class',
-     '**/*Module_*Factory.class'].asImmutable()
-
-def Collection<String> defaultExcludes =
-    (androidDataBindingExcludes + androidExcludes + butterKnifeExcludes + dagger2Excludes)
-        .asImmutable()
-
-getVariants().all { variant ->
-  task("findbugs${variant.name.capitalize()}", type: FindBugs) {
-    description "Analyze ${variant.name} code with the findbugs tool"
-    group "Verification"
-
-    source = variant.javaCompile.source
-    classes = project.fileTree(dir: variant.javaCompile.destinationDir, excludes: defaultExcludes)
-    classpath = variant.javaCompile.classpath
-
-    reports {
-      xml.enabled = isTravis
-      html.enabled = !isTravis
-    }
-    dependsOn variant.javaCompile
-  }
-}
-
-task findbugs() {
-  description "Analyze code with the findbugs tool"
-  group "Verification"
-
-  dependsOn tasks.withType(FindBugs)
-}
-
-task checkstyle(type: Checkstyle) {
-  description 'Run checkstyle'
-  group 'verification'
-
-  configFile file("${project.rootDir}/config/checkstyle/checkstyle.xml")
-  configProperties = [rootDir: "${project.rootDir}"]
-  source 'src'
-  include '**/*.java'
-  exclude '**/gen/**'
-  classpath = files()
-}
-
-check.dependsOn 'checkstyle', 'findbugs', 'pmd', 'lint'
+// Exclude
+check.dependsOn 'checkstyle', 'pmd', 'lint'
 
 apply plugin: 'jacoco'
 
diff --git a/config/findbugs/findbugs-config.xml b/config/findbugs/findbugs-config.xml
deleted file mode 100755
index 3b610f57d..000000000
--- a/config/findbugs/findbugs-config.xml
+++ /dev/null
@@ -1,1066 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated by SonarQube -->
-<FindBugsFilter>
-  <Match>
-    <Bug pattern="BC_IMPOSSIBLE_DOWNCAST"/>
-  </Match>
-  <Match>
-    <Bug pattern="BC_IMPOSSIBLE_DOWNCAST_OF_TOARRAY"/>
-  </Match>
-  <Match>
-    <Bug pattern="EC_INCOMPATIBLE_ARRAY_COMPARE"/>
-  </Match>
-  <Match>
-    <Bug pattern="EC_INCOMPATIBLE_ARRAY_COMPARE"/>
-  </Match>
-  <Match>
-    <Bug pattern="LG_LOST_LOGGER_DUE_TO_WEAK_REFERENCE"/>
-  </Match>
-  <Match>
-    <Bug pattern="NP_CLOSING_NULL"/>
-  </Match>
-  <Match>
-    <Bug pattern="RC_REF_COMPARISON_BAD_PRACTICE"/>
-  </Match>
-  <Match>
-    <Bug pattern="RC_REF_COMPARISON_BAD_PRACTICE_BOOLEAN"/>
-  </Match>
-  <Match>
-    <Bug pattern="RV_RETURN_VALUE_OF_PUTIFABSENT_IGNORED"/>
-  </Match>
-  <Match>
-    <Bug pattern="SIC_THREADLOCAL_DEADLY_EMBRACE"/>
-  </Match>
-  <Match>
-    <Bug pattern="UR_UNINIT_READ_CALLED_FROM_SUPER_CONSTRUCTOR"/>
-  </Match>
-  <Match>
-    <Bug pattern="VA_FORMAT_STRING_EXPECTED_MESSAGE_FORMAT_SUPPLIED"/>
-  </Match>
-  <Match>
-    <Bug pattern="SKIPPED_CLASS_TOO_BIG"/>
-  </Match>
-  <Match>
-    <Bug pattern="DMI_SCHEDULED_THREAD_POOL_EXECUTOR_WITH_ZERO_CORE_THREADS"/>
-  </Match>
-  <Match>
-    <Bug pattern="DMI_FUTILE_ATTEMPT_TO_CHANGE_MAXPOOL_SIZE_OF_SCHEDULED_THREAD_POOL_EXECUTOR"/>
-  </Match>
-  <Match>
-    <Bug pattern="DMI_UNSUPPORTED_METHOD"/>
-  </Match>
-  <Match>
-    <Bug pattern="DMI_EMPTY_DB_PASSWORD"/>
-  </Match>
-  <Match>
-    <Bug pattern="DMI_CONSTANT_DB_PASSWORD"/>
-  </Match>
-  <Match>
-    <Bug pattern="HRS_REQUEST_PARAMETER_TO_COOKIE"/>
-  </Match>
-  <Match>
-    <Bug pattern="HRS_REQUEST_PARAMETER_TO_HTTP_HEADER"/>
-  </Match>
-  <Match>
-    <Bug pattern="XSS_REQUEST_PARAMETER_TO_SERVLET_WRITER"/>
-  </Match>
-  <Match>
-    <Bug pattern="XSS_REQUEST_PARAMETER_TO_SEND_ERROR"/>
-  </Match>
-  <Match>
-    <Bug pattern="XSS_REQUEST_PARAMETER_TO_JSP_WRITER"/>
-  </Match>
-  <Match>
-    <Bug pattern="SW_SWING_METHODS_INVOKED_IN_SWING_THREAD"/>
-  </Match>
-  <Match>
-    <Bug pattern="IL_INFINITE_LOOP"/>
-  </Match>
-  <Match>
-    <Bug pattern="IL_INFINITE_RECURSIVE_LOOP"/>
-  </Match>
-  <Match>
-    <Bug pattern="IL_CONTAINER_ADDED_TO_ITSELF"/>
-  </Match>
-  <Match>
-    <Bug pattern="VO_VOLATILE_REFERENCE_TO_ARRAY"/>
-  </Match>
-  <Match>
-    <Bug pattern="UI_INHERITANCE_UNSAFE_GETRESOURCE"/>
-  </Match>
-  <Match>
-    <Bug pattern="NP_BOOLEAN_RETURN_NULL"/>
-  </Match>
-  <Match>
-    <Bug pattern="NP_SYNC_AND_NULL_CHECK_FIELD"/>
-  </Match>
-  <Match>
-    <Bug pattern="RpC_REPEATED_CONDITIONAL_TEST"/>
-  </Match>
-  <Match>
-    <Bug pattern="AM_CREATES_EMPTY_ZIP_FILE_ENTRY"/>
-  </Match>
-  <Match>
-    <Bug pattern="AM_CREATES_EMPTY_JAR_FILE_ENTRY"/>
-  </Match>
-  <Match>
-    <Bug pattern="IMSE_DONT_CATCH_IMSE"/>
-  </Match>
-  <Match>
-    <Bug pattern="FL_MATH_USING_FLOAT_PRECISION"/>
-  </Match>
-  <Match>
-    <Bug pattern="CN_IDIOM"/>
-  </Match>
-  <Match>
-    <Bug pattern="CN_IMPLEMENTS_CLONE_BUT_NOT_CLONEABLE"/>
-  </Match>
-  <Match>
-    <Bug pattern="CN_IDIOM_NO_SUPER_CALL"/>
-  </Match>
-  <Match>
-    <Bug pattern="NM_FUTURE_KEYWORD_USED_AS_IDENTIFIER"/>
-  </Match>
-  <Match>
-    <Bug pattern="NM_FUTURE_KEYWORD_USED_AS_MEMBER_IDENTIFIER"/>
-  </Match>
-  <Match>
-    <Bug pattern="DE_MIGHT_DROP"/>
-  </Match>
-  <Match>
-    <Bug pattern="DE_MIGHT_IGNORE"/>
-  </Match>
-  <Match>
-    <Bug pattern="DP_DO_INSIDE_DO_PRIVILEGED"/>
-  </Match>
-  <Match>
-    <Bug pattern="DP_CREATE_CLASSLOADER_INSIDE_DO_PRIVILEGED"/>
-  </Match>
-  <Match>
-    <Bug pattern="JCIP_FIELD_ISNT_FINAL_IN_IMMUTABLE_CLASS"/>
-  </Match>
-  <Match>
-    <Bug pattern="DMI_THREAD_PASSED_WHERE_RUNNABLE_EXPECTED"/>
-  </Match>
-  <Match>
-    <Bug pattern="DMI_COLLECTION_OF_URLS"/>
-  </Match>
-  <Match>
-    <Bug pattern="DMI_BLOCKING_METHODS_ON_URL"/>
-  </Match>
-  <Match>
-    <Bug pattern="DMI_ANNOTATION_IS_NOT_VISIBLE_TO_REFLECTION"/>
-  </Match>
-  <Match>
-    <Bug pattern="DM_EXIT"/>
-  </Match>
-  <Match>
-    <Bug pattern="DM_RUN_FINALIZERS_ON_EXIT"/>
-  </Match>
-  <Match>
-    <Bug pattern="DM_STRING_CTOR"/>
-  </Match>
-  <Match>
-    <Bug pattern="DM_STRING_VOID_CTOR"/>
-  </Match>
-  <Match>
-    <Bug pattern="DM_STRING_TOSTRING"/>
-  </Match>
-  <Match>
-    <Bug pattern="DM_GC"/>
-  </Match>
-  <Match>
-    <Bug pattern="DM_BOOLEAN_CTOR"/>
-  </Match>
-  <Match>
-    <Bug pattern="DM_NUMBER_CTOR"/>
-  </Match>
-  <Match>
-    <Bug pattern="DM_FP_NUMBER_CTOR"/>
-  </Match>
-  <Match>
-    <Bug pattern="DM_CONVERT_CASE"/>
-  </Match>
-  <Match>
-    <Bug pattern="BX_UNBOXED_AND_COERCED_FOR_TERNARY_OPERATOR"/>
-  </Match>
-  <Match>
-    <Bug pattern="BX_BOXING_IMMEDIATELY_UNBOXED"/>
-  </Match>
-  <Match>
-    <Bug pattern="BX_BOXING_IMMEDIATELY_UNBOXED_TO_PERFORM_COERCION"/>
-  </Match>
-  <Match>
-    <Bug pattern="DM_BOXED_PRIMITIVE_TOSTRING"/>
-  </Match>
-  <Match>
-    <Bug pattern="DM_NEW_FOR_GETCLASS"/>
-  </Match>
-  <Match>
-    <Bug pattern="DM_MONITOR_WAIT_ON_CONDITION"/>
-  </Match>
-  <Match>
-    <Bug pattern="RV_01_TO_INT"/>
-  </Match>
-  <Match>
-    <Bug pattern="DM_NEXTINT_VIA_NEXTDOUBLE"/>
-  </Match>
-  <Match>
-    <Bug pattern="SQL_NONCONSTANT_STRING_PASSED_TO_EXECUTE"/>
-  </Match>
-  <Match>
-    <Bug pattern="SQL_PREPARED_STATEMENT_GENERATED_FROM_NONCONSTANT_STRING"/>
-  </Match>
-  <Match>
-    <Bug pattern="DM_USELESS_THREAD"/>
-  </Match>
-  <Match>
-    <Bug pattern="DC_DOUBLECHECK"/>
-  </Match>
-  <Match>
-    <Bug pattern="FI_FINALIZER_NULLS_FIELDS"/>
-  </Match>
-  <Match>
-    <Bug pattern="FI_FINALIZER_ONLY_NULLS_FIELDS"/>
-  </Match>
-  <Match>
-    <Bug pattern="FI_PUBLIC_SHOULD_BE_PROTECTED"/>
-  </Match>
-  <Match>
-    <Bug pattern="FI_EMPTY"/>
-  </Match>
-  <Match>
-    <Bug pattern="FI_NULLIFY_SUPER"/>
-  </Match>
-  <Match>
-    <Bug pattern="FI_USELESS"/>
-  </Match>
-  <Match>
-    <Bug pattern="FI_MISSING_SUPER_CALL"/>
-  </Match>
-  <Match>
-    <Bug pattern="FI_EXPLICIT_INVOCATION"/>
-  </Match>
-  <Match>
-    <Bug pattern="EQ_CHECK_FOR_OPERAND_NOT_COMPATIBLE_WITH_THIS"/>
-  </Match>
-  <Match>
-    <Bug pattern="EQ_DONT_DEFINE_EQUALS_FOR_ENUM"/>
-  </Match>
-  <Match>
-    <Bug pattern="EQ_SELF_USE_OBJECT"/>
-  </Match>
-  <Match>
-    <Bug pattern="EQ_OTHER_USE_OBJECT"/>
-  </Match>
-  <Match>
-    <Bug pattern="EQ_OTHER_NO_OBJECT"/>
-  </Match>
-  <Match>
-    <Bug pattern="EQ_SELF_NO_OBJECT"/>
-  </Match>
-  <Match>
-    <Bug pattern="EQ_OVERRIDING_EQUALS_NOT_SYMMETRIC"/>
-  </Match>
-  <Match>
-    <Bug pattern="EQ_GETCLASS_AND_CLASS_CONSTANT"/>
-  </Match>
-  <Match>
-    <Bug pattern="EQ_UNUSUAL"/>
-  </Match>
-  <Match>
-    <Bug pattern="EQ_COMPARING_CLASS_NAMES"/>
-  </Match>
-  <Match>
-    <Bug pattern="EQ_ALWAYS_TRUE"/>
-  </Match>
-  <Match>
-    <Bug pattern="EQ_ALWAYS_FALSE"/>
-  </Match>
-  <Match>
-    <Bug pattern="HSC_HUGE_SHARED_STRING_CONSTANT"/>
-  </Match>
-  <Match>
-    <Bug pattern="NP_ARGUMENT_MIGHT_BE_NULL"/>
-  </Match>
-  <Match>
-    <Bug pattern="NP_EQUALS_SHOULD_HANDLE_NULL_ARGUMENT"/>
-  </Match>
-  <Match>
-    <Bug pattern="CO_SELF_NO_OBJECT"/>
-  </Match>
-  <Match>
-    <Bug pattern="HE_SIGNATURE_DECLARES_HASHING_OF_UNHASHABLE_CLASS"/>
-  </Match>
-  <Match>
-    <Bug pattern="HE_USE_OF_UNHASHABLE_CLASS"/>
-  </Match>
-  <Match>
-    <Bug pattern="HE_HASHCODE_USE_OBJECT_EQUALS"/>
-  </Match>
-  <Match>
-    <Bug pattern="EQ_COMPARETO_USE_OBJECT_EQUALS"/>
-  </Match>
-  <Match>
-    <Bug pattern="HE_HASHCODE_NO_EQUALS"/>
-  </Match>
-  <Match>
-    <Bug pattern="HE_EQUALS_USE_HASHCODE"/>
-  </Match>
-  <Match>
-    <Bug pattern="HE_INHERITS_EQUALS_USE_HASHCODE"/>
-  </Match>
-  <Match>
-    <Bug pattern="HE_EQUALS_NO_HASHCODE"/>
-  </Match>
-  <Match>
-    <Bug pattern="EQ_ABSTRACT_SELF"/>
-  </Match>
-  <Match>
-    <Bug pattern="ES_COMPARING_STRINGS_WITH_EQ"/>
-  </Match>
-  <Match>
-    <Bug pattern="ES_COMPARING_PARAMETER_STRING_WITH_EQ"/>
-  </Match>
-  <Match>
-    <Bug pattern="CO_ABSTRACT_SELF"/>
-  </Match>
-  <Match>
-    <Bug pattern="IS_FIELD_NOT_GUARDED"/>
-  </Match>
-  <Match>
-    <Bug pattern="MSF_MUTABLE_SERVLET_FIELD"/>
-  </Match>
-  <Match>
-    <Bug pattern="IS2_INCONSISTENT_SYNC"/>
-  </Match>
-  <Match>
-    <Bug pattern="NN_NAKED_NOTIFY"/>
-  </Match>
-  <Match>
-    <Bug pattern="MS_EXPOSE_REP"/>
-  </Match>
-  <Match>
-    <Bug pattern="EI_EXPOSE_REP"/>
-  </Match>
-  <Match>
-    <Bug pattern="EI_EXPOSE_REP2"/>
-  </Match>
-  <Match>
-    <Bug pattern="EI_EXPOSE_STATIC_REP2"/>
-  </Match>
-  <Match>
-    <Bug pattern="RU_INVOKE_RUN"/>
-  </Match>
-  <Match>
-    <Bug pattern="SP_SPIN_ON_FIELD"/>
-  </Match>
-  <Match>
-    <Bug pattern="NS_DANGEROUS_NON_SHORT_CIRCUIT"/>
-  </Match>
-  <Match>
-    <Bug pattern="NS_NON_SHORT_CIRCUIT"/>
-  </Match>
-  <Match>
-    <Bug pattern="TLW_TWO_LOCK_WAIT"/>
-  </Match>
-  <Match>
-    <Bug pattern="UW_UNCOND_WAIT"/>
-  </Match>
-  <Match>
-    <Bug pattern="UR_UNINIT_READ"/>
-  </Match>
-  <Match>
-    <Bug pattern="UG_SYNC_SET_UNSYNC_GET"/>
-  </Match>
-  <Match>
-    <Bug pattern="IC_INIT_CIRCULARITY"/>
-  </Match>
-  <Match>
-    <Bug pattern="IC_SUPERCLASS_USES_SUBCLASS_DURING_INITIALIZATION"/>
-  </Match>
-  <Match>
-    <Bug pattern="IT_NO_SUCH_ELEMENT"/>
-  </Match>
-  <Match>
-    <Bug pattern="DL_SYNCHRONIZATION_ON_SHARED_CONSTANT"/>
-  </Match>
-  <Match>
-    <Bug pattern="DL_SYNCHRONIZATION_ON_BOOLEAN"/>
-  </Match>
-  <Match>
-    <Bug pattern="DL_SYNCHRONIZATION_ON_UNSHARED_BOXED_PRIMITIVE"/>
-  </Match>
-  <Match>
-    <Bug pattern="DL_SYNCHRONIZATION_ON_BOXED_PRIMITIVE"/>
-  </Match>
-  <Match>
-    <Bug pattern="ESync_EMPTY_SYNC"/>
-  </Match>
-  <Match>
-    <Bug pattern="IS_INCONSISTENT_SYNC"/>
-  </Match>
-  <Match>
-    <Bug pattern="ML_SYNC_ON_FIELD_TO_GUARD_CHANGING_THAT_FIELD"/>
-  </Match>
-  <Match>
-    <Bug pattern="ML_SYNC_ON_UPDATED_FIELD"/>
-  </Match>
-  <Match>
-    <Bug pattern="MS_OOI_PKGPROTECT"/>
-  </Match>
-  <Match>
-    <Bug pattern="MS_FINAL_PKGPROTECT"/>
-  </Match>
-  <Match>
-    <Bug pattern="MS_SHOULD_BE_FINAL"/>
-  </Match>
-  <Match>
-    <Bug pattern="MS_PKGPROTECT"/>
-  </Match>
-  <Match>
-    <Bug pattern="MS_MUTABLE_HASHTABLE"/>
-  </Match>
-  <Match>
-    <Bug pattern="MS_MUTABLE_ARRAY"/>
-  </Match>
-  <Match>
-    <Bug pattern="MS_CANNOT_BE_FINAL"/>
-  </Match>
-  <Match>
-    <Bug pattern="IA_AMBIGUOUS_INVOCATION_OF_INHERITED_OR_OUTER_METHOD"/>
-  </Match>
-  <Match>
-    <Bug pattern="NM_SAME_SIMPLE_NAME_AS_SUPERCLASS"/>
-  </Match>
-  <Match>
-    <Bug pattern="NM_SAME_SIMPLE_NAME_AS_INTERFACE"/>
-  </Match>
-  <Match>
-    <Bug pattern="NM_VERY_CONFUSING"/>
-  </Match>
-  <Match>
-    <Bug pattern="NM_VERY_CONFUSING_INTENTIONAL"/>
-  </Match>
-  <Match>
-    <Bug pattern="NM_WRONG_PACKAGE"/>
-  </Match>
-  <Match>
-    <Bug pattern="NM_WRONG_PACKAGE_INTENTIONAL"/>
-  </Match>
-  <Match>
-    <Bug pattern="NM_CONFUSING"/>
-  </Match>
-  <Match>
-    <Bug pattern="NM_METHOD_CONSTRUCTOR_CONFUSION"/>
-  </Match>
-  <Match>
-    <Bug pattern="NM_CLASS_NOT_EXCEPTION"/>
-  </Match>
-  <Match>
-    <Bug pattern="RR_NOT_CHECKED"/>
-  </Match>
-  <Match>
-    <Bug pattern="SR_NOT_CHECKED"/>
-  </Match>
-  <Match>
-    <Bug pattern="SE_READ_RESOLVE_IS_STATIC"/>
-  </Match>
-  <Match>
-    <Bug pattern="SE_PRIVATE_READ_RESOLVE_NOT_INHERITED"/>
-  </Match>
-  <Match>
-    <Bug pattern="SE_READ_RESOLVE_MUST_RETURN_OBJECT"/>
-  </Match>
-  <Match>
-    <Bug pattern="SE_METHOD_MUST_BE_PRIVATE"/>
-  </Match>
-  <Match>
-    <Bug pattern="SE_NO_SUITABLE_CONSTRUCTOR_FOR_EXTERNALIZATION"/>
-  </Match>
-  <Match>
-    <Bug pattern="SE_NO_SUITABLE_CONSTRUCTOR"/>
-  </Match>
-  <Match>
-    <Bug pattern="SE_COMPARATOR_SHOULD_BE_SERIALIZABLE"/>
-  </Match>
-  <Match>
-    <Bug pattern="WS_WRITEOBJECT_SYNC"/>
-  </Match>
-  <Match>
-    <Bug pattern="RS_READOBJECT_SYNC"/>
-  </Match>
-  <Match>
-    <Bug pattern="SE_NONSTATIC_SERIALVERSIONID"/>
-  </Match>
-  <Match>
-    <Bug pattern="SE_NONFINAL_SERIALVERSIONID"/>
-  </Match>
-  <Match>
-    <Bug pattern="SE_NONLONG_SERIALVERSIONID"/>
-  </Match>
-  <Match>
-    <Bug pattern="SE_BAD_FIELD_INNER_CLASS"/>
-  </Match>
-  <Match>
-    <Bug pattern="SE_INNER_CLASS"/>
-  </Match>
-  <Match>
-    <Bug pattern="SE_BAD_FIELD_STORE"/>
-  </Match>
-  <Match>
-    <Bug pattern="SC_START_IN_CTOR"/>
-  </Match>
-  <Match>
-    <Bug pattern="SS_SHOULD_BE_STATIC"/>
-  </Match>
-  <Match>
-    <Bug pattern="UUF_UNUSED_FIELD"/>
-  </Match>
-  <Match>
-    <Bug pattern="URF_UNREAD_FIELD"/>
-  </Match>
-  <Match>
-    <Bug pattern="QF_QUESTIONABLE_FOR_LOOP"/>
-  </Match>
-  <Match>
-    <Bug pattern="UWF_NULL_FIELD"/>
-  </Match>
-  <Match>
-    <Bug pattern="ST_WRITE_TO_STATIC_FROM_INSTANCE_METHOD"/>
-  </Match>
-  <Match>
-    <Bug pattern="NP_LOAD_OF_KNOWN_NULL_VALUE"/>
-  </Match>
-  <Match>
-    <Bug pattern="NP_DEREFERENCE_OF_READLINE_VALUE"/>
-  </Match>
-  <Match>
-    <Bug pattern="NP_IMMEDIATE_DEREFERENCE_OF_READLINE"/>
-  </Match>
-  <Match>
-    <Bug pattern="SIC_INNER_SHOULD_BE_STATIC"/>
-  </Match>
-  <Match>
-    <Bug pattern="SIC_INNER_SHOULD_BE_STATIC_NEEDS_THIS"/>
-  </Match>
-  <Match>
-    <Bug pattern="WA_NOT_IN_LOOP"/>
-  </Match>
-  <Match>
-    <Bug pattern="WA_AWAIT_NOT_IN_LOOP"/>
-  </Match>
-  <Match>
-    <Bug pattern="NO_NOTIFY_NOT_NOTIFYALL"/>
-  </Match>
-  <Match>
-    <Bug pattern="RV_CHECK_FOR_POSITIVE_INDEXOF"/>
-  </Match>
-  <Match>
-    <Bug pattern="RV_DONT_JUST_NULL_CHECK_READLINE"/>
-  </Match>
-  <Match>
-    <Bug pattern="RV_RETURN_VALUE_IGNORED"/>
-  </Match>
-  <Match>
-    <Bug pattern="RV_EXCEPTION_NOT_THROWN"/>
-  </Match>
-  <Match>
-    <Bug pattern="RV_RETURN_VALUE_IGNORED2"/>
-  </Match>
-  <Match>
-    <Bug pattern="NP_ALWAYS_NULL"/>
-  </Match>
-  <Match>
-    <Bug pattern="NP_STORE_INTO_NONNULL_FIELD"/>
-  </Match>
-  <Match>
-    <Bug pattern="NP_ALWAYS_NULL_EXCEPTION"/>
-  </Match>
-  <Match>
-    <Bug pattern="NP_PARAMETER_MUST_BE_NONNULL_BUT_MARKED_AS_NULLABLE"/>
-  </Match>
-  <Match>
-    <Bug pattern="NP_NULL_ON_SOME_PATH"/>
-  </Match>
-  <Match>
-    <Bug pattern="NP_NULL_ON_SOME_PATH_MIGHT_BE_INFEASIBLE"/>
-  </Match>
-  <Match>
-    <Bug pattern="NP_NULL_ON_SOME_PATH_EXCEPTION"/>
-  </Match>
-  <Match>
-    <Bug pattern="NP_NULL_PARAM_DEREF_NONVIRTUAL"/>
-  </Match>
-  <Match>
-    <Bug pattern="NP_NULL_PARAM_DEREF_ALL_TARGETS_DANGEROUS"/>
-  </Match>
-  <Match>
-    <Bug pattern="NP_NULL_PARAM_DEREF"/>
-  </Match>
-  <Match>
-    <Bug pattern="NP_NONNULL_PARAM_VIOLATION"/>
-  </Match>
-  <Match>
-    <Bug pattern="NP_NONNULL_RETURN_VIOLATION"/>
-  </Match>
-  <Match>
-    <Bug pattern="NP_CLONE_COULD_RETURN_NULL"/>
-  </Match>
-  <Match>
-    <Bug pattern="NP_TOSTRING_COULD_RETURN_NULL"/>
-  </Match>
-  <Match>
-    <Bug pattern="NP_GUARANTEED_DEREF"/>
-  </Match>
-  <Match>
-    <Bug pattern="NP_GUARANTEED_DEREF_ON_EXCEPTION_PATH"/>
-  </Match>
-  <Match>
-    <Bug pattern="SI_INSTANCE_BEFORE_FINALS_ASSIGNED"/>
-  </Match>
-  <Match>
-    <Bug pattern="OS_OPEN_STREAM"/>
-  </Match>
-  <Match>
-    <Bug pattern="OS_OPEN_STREAM_EXCEPTION_PATH"/>
-  </Match>
-  <Match>
-    <Bug pattern="PZLA_PREFER_ZERO_LENGTH_ARRAYS"/>
-  </Match>
-  <Match>
-    <Bug pattern="UCF_USELESS_CONTROL_FLOW"/>
-  </Match>
-  <Match>
-    <Bug pattern="UCF_USELESS_CONTROL_FLOW_NEXT_LINE"/>
-  </Match>
-  <Match>
-    <Bug pattern="RCN_REDUNDANT_NULLCHECK_WOULD_HAVE_BEEN_A_NPE"/>
-  </Match>
-  <Match>
-    <Bug pattern="RCN_REDUNDANT_NULLCHECK_OF_NULL_VALUE"/>
-  </Match>
-  <Match>
-    <Bug pattern="RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE"/>
-  </Match>
-  <Match>
-    <Bug pattern="RCN_REDUNDANT_COMPARISON_TWO_NULL_VALUES"/>
-  </Match>
-  <Match>
-    <Bug pattern="RCN_REDUNDANT_COMPARISON_OF_NULL_AND_NONNULL_VALUE"/>
-  </Match>
-  <Match>
-    <Bug pattern="UL_UNRELEASED_LOCK"/>
-  </Match>
-  <Match>
-    <Bug pattern="UL_UNRELEASED_LOCK_EXCEPTION_PATH"/>
-  </Match>
-  <Match>
-    <Bug pattern="RC_REF_COMPARISON"/>
-  </Match>
-  <Match>
-    <Bug pattern="EC_UNRELATED_TYPES_USING_POINTER_EQUALITY"/>
-  </Match>
-  <Match>
-    <Bug pattern="EC_UNRELATED_TYPES"/>
-  </Match>
-  <Match>
-    <Bug pattern="EC_UNRELATED_INTERFACES"/>
-  </Match>
-  <Match>
-    <Bug pattern="EC_UNRELATED_CLASS_AND_INTERFACE"/>
-  </Match>
-  <Match>
-    <Bug pattern="EC_NULL_ARG"/>
-  </Match>
-  <Match>
-    <Bug pattern="MWN_MISMATCHED_WAIT"/>
-  </Match>
-  <Match>
-    <Bug pattern="MWN_MISMATCHED_NOTIFY"/>
-  </Match>
-  <Match>
-    <Bug pattern="SA_LOCAL_SELF_ASSIGNMENT"/>
-  </Match>
-  <Match>
-    <Bug pattern="SA_FIELD_SELF_ASSIGNMENT"/>
-  </Match>
-  <Match>
-    <Bug pattern="SA_FIELD_DOUBLE_ASSIGNMENT"/>
-  </Match>
-  <Match>
-    <Bug pattern="SA_LOCAL_DOUBLE_ASSIGNMENT"/>
-  </Match>
-  <Match>
-    <Bug pattern="SA_FIELD_SELF_COMPUTATION"/>
-  </Match>
-  <Match>
-    <Bug pattern="SA_LOCAL_SELF_COMPUTATION"/>
-  </Match>
-  <Match>
-    <Bug pattern="SA_FIELD_SELF_COMPARISON"/>
-  </Match>
-  <Match>
-    <Bug pattern="SA_LOCAL_SELF_COMPARISON"/>
-  </Match>
-  <Match>
-    <Bug pattern="DMI_LONG_BITS_TO_DOUBLE_INVOKED_ON_INT"/>
-  </Match>
-  <Match>
-    <Bug pattern="DMI_RANDOM_USED_ONLY_ONCE"/>
-  </Match>
-  <Match>
-    <Bug pattern="RV_ABSOLUTE_VALUE_OF_RANDOM_INT"/>
-  </Match>
-  <Match>
-    <Bug pattern="RV_ABSOLUTE_VALUE_OF_HASHCODE"/>
-  </Match>
-  <Match>
-    <Bug pattern="RV_REM_OF_RANDOM_INT"/>
-  </Match>
-  <Match>
-    <Bug pattern="RV_REM_OF_HASHCODE"/>
-  </Match>
-  <Match>
-    <Bug pattern="INT_BAD_COMPARISON_WITH_NONNEGATIVE_VALUE"/>
-  </Match>
-  <Match>
-    <Bug pattern="INT_BAD_COMPARISON_WITH_SIGNED_BYTE"/>
-  </Match>
-  <Match>
-    <Bug pattern="INT_VACUOUS_BIT_OPERATION"/>
-  </Match>
-  <Match>
-    <Bug pattern="INT_VACUOUS_COMPARISON"/>
-  </Match>
-  <Match>
-    <Bug pattern="INT_BAD_REM_BY_1"/>
-  </Match>
-  <Match>
-    <Bug pattern="BIT_IOR_OF_SIGNED_BYTE"/>
-  </Match>
-  <Match>
-    <Bug pattern="BIT_ADD_OF_SIGNED_BYTE"/>
-  </Match>
-  <Match>
-    <Bug pattern="BIT_AND"/>
-  </Match>
-  <Match>
-    <Bug pattern="BIT_SIGNED_CHECK"/>
-  </Match>
-  <Match>
-    <Bug pattern="BIT_SIGNED_CHECK_HIGH_BIT"/>
-  </Match>
-  <Match>
-    <Bug pattern="BIT_AND_ZZ"/>
-  </Match>
-  <Match>
-    <Bug pattern="BIT_IOR"/>
-  </Match>
-  <Match>
-    <Bug pattern="LI_LAZY_INIT_STATIC"/>
-  </Match>
-  <Match>
-    <Bug pattern="LI_LAZY_INIT_UPDATE_STATIC"/>
-  </Match>
-  <Match>
-    <Bug pattern="JLM_JSR166_LOCK_MONITORENTER"/>
-  </Match>
-  <Match>
-    <Bug pattern="UPM_UNCALLED_PRIVATE_METHOD"/>
-  </Match>
-  <Match>
-    <Bug pattern="UMAC_UNCALLABLE_METHOD_OF_ANONYMOUS_CLASS"/>
-  </Match>
-  <Match>
-    <Bug pattern="ODR_OPEN_DATABASE_RESOURCE"/>
-  </Match>
-  <Match>
-    <Bug pattern="ODR_OPEN_DATABASE_RESOURCE_EXCEPTION_PATH"/>
-  </Match>
-  <Match>
-    <Bug pattern="SBSC_USE_STRINGBUFFER_CONCATENATION"/>
-  </Match>
-  <Match>
-    <Bug pattern="ITA_INEFFICIENT_TO_ARRAY"/>
-  </Match>
-  <Match>
-    <Bug pattern="IJU_ASSERT_METHOD_INVOKED_FROM_RUN_METHOD"/>
-  </Match>
-  <Match>
-    <Bug pattern="IJU_SETUP_NO_SUPER"/>
-  </Match>
-  <Match>
-    <Bug pattern="IJU_TEARDOWN_NO_SUPER"/>
-  </Match>
-  <Match>
-    <Bug pattern="IJU_SUITE_NOT_STATIC"/>
-  </Match>
-  <Match>
-    <Bug pattern="IJU_BAD_SUITE_METHOD"/>
-  </Match>
-  <Match>
-    <Bug pattern="IJU_NO_TESTS"/>
-  </Match>
-  <Match>
-    <Bug pattern="BOA_BADLY_OVERRIDDEN_ADAPTER"/>
-  </Match>
-  <Match>
-    <Bug pattern="SQL_BAD_RESULTSET_ACCESS"/>
-  </Match>
-  <Match>
-    <Bug pattern="SQL_BAD_PREPARED_STATEMENT_ACCESS"/>
-  </Match>
-  <Match>
-    <Bug pattern="SIO_SUPERFLUOUS_INSTANCEOF"/>
-  </Match>
-  <Match>
-    <Bug pattern="EC_ARRAY_AND_NONARRAY"/>
-  </Match>
-  <Match>
-    <Bug pattern="EC_BAD_ARRAY_COMPARE"/>
-  </Match>
-  <Match>
-    <Bug pattern="STI_INTERRUPTED_ON_CURRENTTHREAD"/>
-  </Match>
-  <Match>
-    <Bug pattern="STI_INTERRUPTED_ON_UNKNOWNTHREAD"/>
-  </Match>
-  <Match>
-    <Bug pattern="IP_PARAMETER_IS_DEAD_BUT_OVERWRITTEN"/>
-  </Match>
-  <Match>
-    <Bug pattern="DLS_DEAD_LOCAL_STORE_IN_RETURN"/>
-  </Match>
-  <Match>
-    <Bug pattern="DLS_DEAD_STORE_OF_CLASS_LITERAL"/>
-  </Match>
-  <Match>
-    <Bug pattern="DLS_DEAD_LOCAL_STORE_OF_NULL"/>
-  </Match>
-  <Match>
-    <Bug pattern="MF_METHOD_MASKS_FIELD"/>
-  </Match>
-  <Match>
-    <Bug pattern="MF_CLASS_MASKS_FIELD"/>
-  </Match>
-  <Match>
-    <Bug pattern="WMI_WRONG_MAP_ITERATOR"/>
-  </Match>
-  <Match>
-    <Bug pattern="ISC_INSTANTIATE_STATIC_CLASS"/>
-  </Match>
-  <Match>
-    <Bug pattern="REC_CATCH_EXCEPTION"/>
-  </Match>
-  <Match>
-    <Bug pattern="FE_TEST_IF_EQUAL_TO_NOT_A_NUMBER"/>
-  </Match>
-  <Match>
-    <Bug pattern="FE_FLOATING_POINT_EQUALITY"/>
-  </Match>
-  <Match>
-    <Bug pattern="UM_UNNECESSARY_MATH"/>
-  </Match>
-  <Match>
-    <Bug pattern="RI_REDUNDANT_INTERFACES"/>
-  </Match>
-  <Match>
-    <Bug pattern="MTIA_SUSPECT_STRUTS_INSTANCE_FIELD"/>
-  </Match>
-  <Match>
-    <Bug pattern="MTIA_SUSPECT_SERVLET_INSTANCE_FIELD"/>
-  </Match>
-  <Match>
-    <Bug pattern="PS_PUBLIC_SEMAPHORES"/>
-  </Match>
-  <Match>
-    <Bug pattern="ICAST_INTEGER_MULTIPLY_CAST_TO_LONG"/>
-  </Match>
-  <Match>
-    <Bug pattern="ICAST_INT_CAST_TO_FLOAT_PASSED_TO_ROUND"/>
-  </Match>
-  <Match>
-    <Bug pattern="ICAST_INT_CAST_TO_DOUBLE_PASSED_TO_CEIL"/>
-  </Match>
-  <Match>
-    <Bug pattern="ICAST_IDIV_CAST_TO_DOUBLE"/>
-  </Match>
-  <Match>
-    <Bug pattern="J2EE_STORE_OF_NON_SERIALIZABLE_OBJECT_INTO_SESSION"/>
-  </Match>
-  <Match>
-    <Bug pattern="DMI_NONSERIALIZABLE_OBJECT_WRITTEN"/>
-  </Match>
-  <Match>
-    <Bug pattern="VA_FORMAT_STRING_NO_PREVIOUS_ARGUMENT"/>
-  </Match>
-  <Match>
-    <Bug pattern="VA_FORMAT_STRING_BAD_CONVERSION"/>
-  </Match>
-  <Match>
-    <Bug pattern="VA_FORMAT_STRING_BAD_CONVERSION_TO_BOOLEAN"/>
-  </Match>
-  <Match>
-    <Bug pattern="VA_FORMAT_STRING_BAD_CONVERSION_FROM_ARRAY"/>
-  </Match>
-  <Match>
-    <Bug pattern="VA_FORMAT_STRING_ARG_MISMATCH"/>
-  </Match>
-  <Match>
-    <Bug pattern="VA_FORMAT_STRING_EXTRA_ARGUMENTS_PASSED"/>
-  </Match>
-  <Match>
-    <Bug pattern="VA_FORMAT_STRING_ILLEGAL"/>
-  </Match>
-  <Match>
-    <Bug pattern="VA_FORMAT_STRING_MISSING_ARGUMENT"/>
-  </Match>
-  <Match>
-    <Bug pattern="VA_FORMAT_STRING_BAD_ARGUMENT"/>
-  </Match>
-  <Match>
-    <Bug pattern="VA_PRIMITIVE_ARRAY_PASSED_TO_OBJECT_VARARG"/>
-  </Match>
-  <Match>
-    <Bug pattern="BC_EQUALS_METHOD_SHOULD_WORK_FOR_ALL_OBJECTS"/>
-  </Match>
-  <Match>
-    <Bug pattern="BC_BAD_CAST_TO_ABSTRACT_COLLECTION"/>
-  </Match>
-  <Match>
-    <Bug pattern="BC_IMPOSSIBLE_CAST"/>
-  </Match>
-  <Match>
-    <Bug pattern="NP_NULL_INSTANCEOF"/>
-  </Match>
-  <Match>
-    <Bug pattern="BC_IMPOSSIBLE_INSTANCEOF"/>
-  </Match>
-  <Match>
-    <Bug pattern="BC_VACUOUS_INSTANCEOF"/>
-  </Match>
-  <Match>
-    <Bug pattern="BC_UNCONFIRMED_CAST"/>
-  </Match>
-  <Match>
-    <Bug pattern="BC_BAD_CAST_TO_CONCRETE_COLLECTION"/>
-  </Match>
-  <Match>
-    <Bug pattern="RE_POSSIBLE_UNINTENDED_PATTERN"/>
-  </Match>
-  <Match>
-    <Bug pattern="RE_BAD_SYNTAX_FOR_REGULAR_EXPRESSION"/>
-  </Match>
-  <Match>
-    <Bug pattern="RE_CANT_USE_FILE_SEPARATOR_AS_REGULAR_EXPRESSION"/>
-  </Match>
-  <Match>
-    <Bug pattern="DLS_OVERWRITTEN_INCREMENT"/>
-  </Match>
-  <Match>
-    <Bug pattern="ICAST_QUESTIONABLE_UNSIGNED_RIGHT_SHIFT"/>
-  </Match>
-  <Match>
-    <Bug pattern="ICAST_BAD_SHIFT_AMOUNT"/>
-  </Match>
-  <Match>
-    <Bug pattern="IM_MULTIPLYING_RESULT_OF_IREM"/>
-  </Match>
-  <Match>
-    <Bug pattern="DMI_INVOKING_HASHCODE_ON_ARRAY"/>
-  </Match>
-  <Match>
-    <Bug pattern="DMI_INVOKING_TOSTRING_ON_ARRAY"/>
-  </Match>
-  <Match>
-    <Bug pattern="DMI_INVOKING_TOSTRING_ON_ANONYMOUS_ARRAY"/>
-  </Match>
-  <Match>
-    <Bug pattern="IM_AVERAGE_COMPUTATION_COULD_OVERFLOW"/>
-  </Match>
-  <Match>
-    <Bug pattern="IM_BAD_CHECK_FOR_ODD"/>
-  </Match>
-  <Match>
-    <Bug pattern="DMI_HARDCODED_ABSOLUTE_FILENAME"/>
-  </Match>
-  <Match>
-    <Bug pattern="DMI_BAD_MONTH"/>
-  </Match>
-  <Match>
-    <Bug pattern="DMI_USELESS_SUBSTRING"/>
-  </Match>
-  <Match>
-    <Bug pattern="DMI_CALLING_NEXT_FROM_HASNEXT"/>
-  </Match>
-  <Match>
-    <Bug pattern="SWL_SLEEP_WITH_LOCK_HELD"/>
-  </Match>
-  <Match>
-    <Bug pattern="DB_DUPLICATE_BRANCHES"/>
-  </Match>
-  <Match>
-    <Bug pattern="DB_DUPLICATE_SWITCH_CLAUSES"/>
-  </Match>
-  <Match>
-    <Bug pattern="XFB_XML_FACTORY_BYPASS"/>
-  </Match>
-  <Match>
-    <Bug pattern="CI_CONFUSED_INHERITANCE"/>
-  </Match>
-  <Match>
-    <Bug pattern="QBA_QUESTIONABLE_BOOLEAN_ASSIGNMENT"/>
-  </Match>
-  <Match>
-    <Bug pattern="GC_UNCHECKED_TYPE_IN_GENERIC_CALL"/>
-  </Match>
-  <Match>
-    <Bug pattern="GC_UNRELATED_TYPES"/>
-  </Match>
-  <Match>
-    <Bug pattern="DMI_COLLECTIONS_SHOULD_NOT_CONTAIN_THEMSELVES"/>
-  </Match>
-  <Match>
-    <Bug pattern="DMI_VACUOUS_SELF_COLLECTION_CALL"/>
-  </Match>
-  <Match>
-    <Bug pattern="DMI_USING_REMOVEALL_TO_CLEAR_COLLECTION"/>
-  </Match>
-  <Match>
-    <Bug pattern="STCAL_STATIC_CALENDAR_INSTANCE"/>
-  </Match>
-  <Match>
-    <Bug pattern="STCAL_INVOKE_ON_STATIC_CALENDAR_INSTANCE"/>
-  </Match>
-  <Match>
-    <Bug pattern="STCAL_STATIC_SIMPLE_DATE_FORMAT_INSTANCE"/>
-  </Match>
-  <Match>
-    <Bug pattern="STCAL_INVOKE_ON_STATIC_DATE_FORMAT_INSTANCE"/>
-  </Match>
-  <Match>
-    <Bug pattern="TQ_ALWAYS_VALUE_USED_WHERE_NEVER_REQUIRED"/>
-  </Match>
-  <Match>
-    <Bug pattern="TQ_NEVER_VALUE_USED_WHERE_ALWAYS_REQUIRED"/>
-  </Match>
-  <Match>
-    <Bug pattern="TQ_MAYBE_SOURCE_VALUE_REACHES_ALWAYS_SINK"/>
-  </Match>
-  <Match>
-    <Bug pattern="TQ_MAYBE_SOURCE_VALUE_REACHES_NEVER_SINK"/>
-  </Match>
-  <Match>
-    <Bug pattern="TQ_EXPLICIT_UNKNOWN_SOURCE_VALUE_REACHES_NEVER_SINK"/>
-  </Match>
-  <Match>
-    <Bug pattern="TQ_EXPLICIT_UNKNOWN_SOURCE_VALUE_REACHES_ALWAYS_SINK"/>
-  </Match>
-  <Match>
-    <Bug pattern="IO_APPENDING_TO_OBJECT_OUTPUT_STREAM"/>
-  </Match>
-  <Match>
-    <Bug pattern="WL_USING_GETCLASS_RATHER_THAN_CLASS_LITERAL"/>
-  </Match>
-</FindBugsFilter>
\ No newline at end of file
diff --git a/config/findbugs/findbugs-excludes.xml b/config/findbugs/findbugs-excludes.xml
deleted file mode 100755
index d0bdf858e..000000000
--- a/config/findbugs/findbugs-excludes.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<FindBugsFilter>
-  <!-- Fallback excludes file.  This file will be used when a project lacks a findbugs-excludes.xml file -->
-  <Match>
-    <Source name="~.*\.kt"/>
-  </Match>
-  <Match>
-    <Source name="~.*\.groovy"/>
-    <Or>
-      <Field name="~__.*"/>
-      <Field name="~\$.*"/>
-      <Method name="~\$.*"/>
-    </Or>
-  </Match>
-  <Match>
-    <Source name="~.*\.groovy"/>
-    <Bug code="UPM"/>
-  </Match>
-  <Match>
-    <!-- ignore all issues in resource generation -->
-    <Class name="~.*\.R\$.*"/>
-  </Match>
-  <Match>
-    <Class name="~.*\.Manifest\$.*"/>
-  </Match>
-  <!-- ignore all bugs in test classes, except for those bugs specifically relating to JUnit tests -->
-  <Match>
-    <Class name="~.*\.*Test"/>
-    <!-- test classes are suffixed by 'Test' -->
-    <Not>
-      <Bug code="IJU"/> <!-- 'IJU' is the code for bugs related to JUnit test code -->
-    </Not>
-  </Match>
-</FindBugsFilter>
\ No newline at end of file