diff --git a/conf/eclipse/cleanup.xml b/conf/eclipse/cleanup.xml
index 40a8fd9..feca0d5 100644
--- a/conf/eclipse/cleanup.xml
+++ b/conf/eclipse/cleanup.xml
@@ -7,7 +7,7 @@
 <setting id="cleanup.remove_trailing_whitespaces_ignore_empty" value="false"/>
 <setting id="cleanup.format_source_code_changes_only" value="false"/>
 <setting id="cleanup.qualify_static_field_accesses_with_declaring_class" value="false"/>
-<setting id="cleanup.add_generated_serial_version_id" value="true"/>
+<setting id="cleanup.add_generated_serial_version_id" value="false"/>
 <setting id="cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class" value="true"/>
 <setting id="cleanup.remove_unused_imports" value="true"/>
 <setting id="cleanup.make_private_fields_final" value="true"/>
@@ -34,8 +34,8 @@
 <setting id="cleanup.remove_unnecessary_casts" value="true"/>
 <setting id="cleanup.use_blocks_only_for_return_and_throw" value="false"/>
 <setting id="cleanup.format_source_code" value="true"/>
-<setting id="cleanup.convert_functional_interfaces" value="false"/>
-<setting id="cleanup.add_default_serial_version_id" value="false"/>
+<setting id="cleanup.convert_functional_interfaces" value="true"/>
+<setting id="cleanup.add_default_serial_version_id" value="true"/>
 <setting id="cleanup.remove_unused_private_methods" value="true"/>
 <setting id="cleanup.remove_trailing_whitespaces" value="true"/>
 <setting id="cleanup.make_type_abstract_if_missing_method" value="false"/>