diff --git a/.rubocop.yml b/.rubocop.yml
index 51cfb7175..7294819b8 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -22,18 +22,14 @@ Style/AccessorMethodName:
 Style/AlignParameters:
   Enabled: false
 
-# Support use of and and or for control flow.
+# Allow and/or for control flow only
 Style/AndOr:
-  Enabled: false
+  EnforcedStyle: conditionals
 
 # Allow multi-line blocks of all sorts
 Style/Blocks:
   Enabled: false
 
-# TODO: Decide on the desired style (nested or compact)
-Style/ClassAndModuleChildren:
-  Enabled: false
-
 # Dot at end of line makes it clearer that the line is not done
 Style/DotPosition:
   EnforcedStyle: trailing
@@ -79,10 +75,6 @@ Style/SignalException:
 Style/SingleLineBlockParams:
   Enabled: false
 
-# Allow non-interpolated strings with double quotes
-Style/StringLiterals:
-  Enabled: false
-
 # Allow semantic choice of trailing comma
 Style/TrailingComma:
   Enabled: false