diff --git a/contrib/uncrustify.cfg b/contrib/uncrustify.cfg
index 8b4cf3dc..af2d8e69 100644
--- a/contrib/uncrustify.cfg
+++ b/contrib/uncrustify.cfg
@@ -28,7 +28,7 @@ ls_code_width=true
 pos_arith=lead
 
 # Fully parenthesize boolean exprs
-mod_full_paren_if_bool=true
+mod_full_paren_if_bool=false
 
 # Braces should be on their own line
 nl_fdef_brace=add
@@ -66,7 +66,6 @@ sp_before_assign = add
 sp_after_assign = add
 
 # we want "char *foo;"
-sp_before_ptr_star = add
 sp_after_ptr_star = remove
 sp_between_ptr_star = remove
 
@@ -76,9 +75,6 @@ sp_before_sparen = add
 sp_inside_fparen = remove
 sp_inside_sparen = remove
 
-# Add or remove space around compare operator '<', '>', '==', etc
-sp_compare                                = add    # ignore/add/remove/force
-
 # add space before function call and decl: "foo (x)"
 sp_func_call_paren = add
 sp_func_proto_paren = add
@@ -97,19 +93,3 @@ nl_func_type_name = force
 nl_else_brace = add
 nl_elseif_brace = add
 nl_for_brace = add
-
-# Whether to ignore the '#define' body while formatting.
-pp_ignore_define_body           = true    # true/false
-
-# Add or remove space between #else or #endif and a trailing comment.
-sp_endif_cmt                    = add   # ignore/add/remove/force
-
-# The span for aligning comments that end lines.
-#
-# 0: Don't align (default).
-align_right_cmt_span            = 3        # unsigned number
-
-# Minimum number of columns between preceding text and a trailing comment in
-# order for the comment to qualify for being aligned. Must be non-zero to have
-# an effect.
-align_right_cmt_gap             = 2        # unsigned number