diff --git a/HepLean/AnomalyCancellation/MSSMNu/Y3.lean b/HepLean/AnomalyCancellation/MSSMNu/Y3.lean
index b5f07d3..ba5b1cb 100644
--- a/HepLean/AnomalyCancellation/MSSMNu/Y3.lean
+++ b/HepLean/AnomalyCancellation/MSSMNu/Y3.lean
@@ -71,9 +71,11 @@ lemma doublePoint_Y₃_Y₃ (R : MSSMACC.LinSols) :
   simp only [mul_one, Fin.isValue, toSMSpecies_apply, one_mul, mul_neg, neg_mul, neg_neg, mul_zero,
     zero_mul, add_zero, Hd_apply, Fin.reduceFinMk, Hu_apply]
   have hLin := R.linearSol
-  simp at hLin
+  simp only [MSSMACC_numberLinear, MSSMACC_linearACCs, Nat.reduceMul, Fin.isValue,
+    Fin.reduceFinMk] at hLin
   have h3 := hLin 3
-  simp [Fin.sum_univ_three] at h3
+  simp only [Fin.isValue, Fin.sum_univ_three, Prod.mk_zero_zero, Prod.mk_one_one, LinearMap.coe_mk,
+    AddHom.coe_mk] at h3
   linear_combination (norm := ring_nf) 6 * h3
   simp only [Fin.isValue, Prod.mk_zero_zero, Prod.mk_one_one, add_add_sub_cancel, add_neg_cancel]
 
diff --git a/HepLean/AnomalyCancellation/PureU1/Permutations.lean b/HepLean/AnomalyCancellation/PureU1/Permutations.lean
index de2cecf..5b758fe 100644
--- a/HepLean/AnomalyCancellation/PureU1/Permutations.lean
+++ b/HepLean/AnomalyCancellation/PureU1/Permutations.lean
@@ -51,7 +51,8 @@ def permCharges {n : ℕ} : Representation ℚ (PermGroup n) (PureU1 n).Charges
 
 lemma accGrav_invariant {n : ℕ} (f : (PermGroup n)) (S : (PureU1 n).Charges) :
     PureU1.accGrav n (permCharges f S) = accGrav n S := by
-  simp [accGrav, permCharges]
+  simp only [accGrav, PermGroup, permCharges, MonoidHom.coe_mk, OneHom.coe_mk, LinearMap.coe_mk,
+    AddHom.coe_mk, chargeMap_apply]
   apply (Equiv.Perm.sum_comp _ _ _ ?_)
   simp
 
@@ -144,7 +145,7 @@ lemma pairSwap_other {n : ℕ} (i j k : Fin n) (hik : i ≠ k) (hjk : j ≠ k) :
 
 lemma pairSwap_inv_other {n : ℕ} {i j k : Fin n} (hik : i ≠ k) (hjk : j ≠ k) :
     (pairSwap i j).invFun k = k := by
-  simp [pairSwap]
+  simp only [pairSwap, Equiv.invFun_as_coe, Equiv.coe_fn_symm_mk]
   split
   · rename_i h
     exact False.elim (hik (id (Eq.symm h)))
@@ -197,8 +198,8 @@ lemma permTwo_fst : (permTwo hij hij').toFun i' = i := by
   have ht := Equiv.extendSubtype_apply_of_mem
     ((permTwoInj hij').toEquivRange.symm.trans
     (permTwoInj hij).toEquivRange) i' (permTwoInj_fst hij')
-  simp at ht
-  simp [ht, permTwoInj_fst_apply]
+  simp only [Equiv.trans_apply, Function.Embedding.toEquivRange_apply] at ht
+  simp only [Equiv.toFun_as_coe, ht, permTwoInj_fst_apply, Fin.isValue]
   rfl
 
 lemma permTwo_snd : (permTwo hij hij').toFun j' = j := by
diff --git a/HepLean/AnomalyCancellation/SM/Basic.lean b/HepLean/AnomalyCancellation/SM/Basic.lean
index 73e0865..f4c1820 100644
--- a/HepLean/AnomalyCancellation/SM/Basic.lean
+++ b/HepLean/AnomalyCancellation/SM/Basic.lean
@@ -269,7 +269,7 @@ def cubeTriLin : TriLinearSymm (SMCharges n).Charges := TriLinearSymm.mk₃
     apply Fintype.sum_congr
     intro i
     repeat erw [map_smul]
-    simp [HSMul.hSMul, SMul.smul]
+    simp only [HSMul.hSMul, SMul.smul, toSpecies_apply, Fin.isValue]
     ring)
   (by
     intro S T R L
diff --git a/HepLean/AnomalyCancellation/SM/NoGrav/Basic.lean b/HepLean/AnomalyCancellation/SM/NoGrav/Basic.lean
index d2a7f97..e08ca66 100644
--- a/HepLean/AnomalyCancellation/SM/NoGrav/Basic.lean
+++ b/HepLean/AnomalyCancellation/SM/NoGrav/Basic.lean
@@ -38,12 +38,12 @@ variable {n : ℕ}
 
 lemma SU2Sol (S : (SMNoGrav n).LinSols) : accSU2 S.val = 0 := by
   have hS := S.linearSol
-  simp at hS
+  simp only [SMNoGrav_numberLinear, SMNoGrav_linearACCs, Fin.isValue] at hS
   exact hS 0
 
 lemma SU3Sol (S : (SMNoGrav n).LinSols) : accSU3 S.val = 0 := by
   have hS := S.linearSol
-  simp at hS
+  simp only [SMNoGrav_numberLinear, SMNoGrav_linearACCs, Fin.isValue] at hS
   exact hS 1
 
 lemma cubeSol (S : (SMNoGrav n).Sols) : accCube S.val = 0 := by
@@ -55,7 +55,7 @@ def chargeToLinear (S : (SMNoGrav n).Charges) (hSU2 : accSU2 S = 0) (hSU3 : accS
     (SMNoGrav n).LinSols :=
   ⟨S, by
     intro i
-    simp at i
+    simp only [SMNoGrav_numberLinear] at i
     match i with
     | 0 => exact hSU2
     | 1 => exact hSU3⟩
diff --git a/HepLean/AnomalyCancellation/SMNu/Ordinary/Basic.lean b/HepLean/AnomalyCancellation/SMNu/Ordinary/Basic.lean
index 9364e2d..b0fed2e 100644
--- a/HepLean/AnomalyCancellation/SMNu/Ordinary/Basic.lean
+++ b/HepLean/AnomalyCancellation/SMNu/Ordinary/Basic.lean
@@ -37,17 +37,17 @@ variable {n : ℕ}
 
 lemma gravSol (S : (SM n).LinSols) : accGrav S.val = 0 := by
   have hS := S.linearSol
-  simp at hS
+  simp only [SM_numberLinear, SM_linearACCs, Fin.isValue] at hS
   exact hS 0
 
 lemma SU2Sol (S : (SM n).LinSols) : accSU2 S.val = 0 := by
   have hS := S.linearSol
-  simp at hS
+  simp only [SM_numberLinear, SM_linearACCs, Fin.isValue] at hS
   exact hS 1
 
 lemma SU3Sol (S : (SM n).LinSols) : accSU3 S.val = 0 := by
   have hS := S.linearSol
-  simp at hS
+  simp only [SM_numberLinear, SM_linearACCs, Fin.isValue] at hS
   exact hS 2
 
 lemma cubeSol (S : (SM n).Sols) : accCube S.val = 0 := S.cubicSol
@@ -58,7 +58,7 @@ def chargeToLinear (S : (SM n).Charges) (hGrav : accGrav S = 0)
     (hSU2 : accSU2 S = 0) (hSU3 : accSU3 S = 0) : (SM n).LinSols :=
   ⟨S, by
     intro i
-    simp at i
+    simp only [SM_numberLinear] at i
     match i with
     | 0 => exact hGrav
     | 1 => exact hSU2
@@ -100,14 +100,14 @@ def perm (n : ℕ) : ACCSystemGroupAction (SM n) where
   rep := repCharges
   linearInvariant := by
     intro i
-    simp at i
+    simp only [SM_numberLinear] at i
     match i with
     | 0 => exact accGrav_invariant
     | 1 => exact accSU2_invariant
     | 2 => exact accSU3_invariant
   quadInvariant := by
     intro i
-    simp at i
+    simp only [SM_numberQuadratic] at i
     exact Fin.elim0 i
   cubicInvariant := accCube_invariant
 
diff --git a/HepLean/BeyondTheStandardModel/TwoHDM/Basic.lean b/HepLean/BeyondTheStandardModel/TwoHDM/Basic.lean
index 2fbd9fa..cbabc05 100644
--- a/HepLean/BeyondTheStandardModel/TwoHDM/Basic.lean
+++ b/HepLean/BeyondTheStandardModel/TwoHDM/Basic.lean
@@ -88,6 +88,7 @@ lemma left_zero : potential m₁₁2 m₂₂2 𝓵₁ 𝓵₂ 𝓵₃ 𝓵₄ m
 def IsBounded (m₁₁2 m₂₂2 𝓵₁ 𝓵₂ 𝓵₃ 𝓵₄ : ℝ) (m₁₂2 𝓵₅ 𝓵₆ 𝓵₇ : ℂ) : Prop :=
   ∃ c, ∀ Φ1 Φ2 x, c ≤ potential m₁₁2 m₂₂2 𝓵₁ 𝓵₂ 𝓵₃ 𝓵₄ m₁₂2 𝓵₅ 𝓵₆ 𝓵₇ Φ1 Φ2 x
 
+/-! TODO: Show that if the potential is bounded then `0 ≤ 𝓵₁` and `0 ≤ 𝓵₂`. -/
 /-!
 
 ## Smoothness of the potential
diff --git a/HepLean/Mathematics/LinearMaps.lean b/HepLean/Mathematics/LinearMaps.lean
index e01133d..52eb810 100644
--- a/HepLean/Mathematics/LinearMaps.lean
+++ b/HepLean/Mathematics/LinearMaps.lean
@@ -131,7 +131,7 @@ lemma toHomogeneousQuad_add {V : Type} [AddCommMonoid V] [Module ℚ V]
     (τ : BiLinearSymm V) (S T : V) :
     τ.toHomogeneousQuad (S + T) = τ.toHomogeneousQuad S +
     τ.toHomogeneousQuad T + 2 * τ S T := by
-  simp [toHomogeneousQuad_apply]
+  simp only [HomogeneousQuadratic, toHomogeneousQuad_apply, map_add]
   rw [τ.map_add₁, τ.map_add₁, τ.swap T S]
   ring
 
diff --git a/HepLean/SpaceTime/LorentzAlgebra/Basic.lean b/HepLean/SpaceTime/LorentzAlgebra/Basic.lean
index d2293cf..f473b52 100644
--- a/HepLean/SpaceTime/LorentzAlgebra/Basic.lean
+++ b/HepLean/SpaceTime/LorentzAlgebra/Basic.lean
@@ -99,7 +99,7 @@ instance spaceTimeAsLieModule : LieModule ℝ lorentzAlgebra (LorentzVector 3) w
   smul_lie r Λ x := by
     simp [Bracket.bracket, smul_mulVec_assoc]
   lie_smul r Λ x := by
-    simp [Bracket.bracket]
+    simp only [Bracket.bracket]
     rw [mulVec_smul]
 
 end SpaceTime
diff --git a/HepLean/SpaceTime/LorentzVector/AsSelfAdjointMatrix.lean b/HepLean/SpaceTime/LorentzVector/AsSelfAdjointMatrix.lean
index 89385ab..84bb97d 100644
--- a/HepLean/SpaceTime/LorentzVector/AsSelfAdjointMatrix.lean
+++ b/HepLean/SpaceTime/LorentzVector/AsSelfAdjointMatrix.lean
@@ -59,14 +59,23 @@ noncomputable def toSelfAdjointMatrix :
     funext i
     match i with
     | Sum.inl 0 =>
-      simp [fromSelfAdjointMatrix', toSelfAdjointMatrix', toMatrix, toMatrix_isSelfAdjoint]
+      simp only [fromSelfAdjointMatrix', one_div, toSelfAdjointMatrix', toMatrix,
+        LorentzVector.time, Fin.isValue, LorentzVector.space, Function.comp_apply, of_apply,
+        cons_val', cons_val_zero, empty_val', cons_val_fin_one, cons_val_one, head_cons,
+        head_fin_const, add_add_sub_cancel, add_re, ofReal_re]
       ring_nf
     | Sum.inr 0 =>
       simp [fromSelfAdjointMatrix', toSelfAdjointMatrix', toMatrix, toMatrix_isSelfAdjoint]
     | Sum.inr 1 =>
-      simp [fromSelfAdjointMatrix', toSelfAdjointMatrix', toMatrix, toMatrix_isSelfAdjoint]
+      simp only [fromSelfAdjointMatrix', toSelfAdjointMatrix', toMatrix, LorentzVector.time,
+        Fin.isValue, LorentzVector.space, Function.comp_apply, of_apply, cons_val', cons_val_zero,
+        empty_val', cons_val_fin_one, cons_val_one, head_fin_const, add_im, ofReal_im, mul_im,
+        ofReal_re, I_im, mul_one, I_re, mul_zero, add_zero, zero_add]
     | Sum.inr 2 =>
-      simp [fromSelfAdjointMatrix', toSelfAdjointMatrix', toMatrix, toMatrix_isSelfAdjoint]
+      simp only [fromSelfAdjointMatrix', one_div, toSelfAdjointMatrix', toMatrix,
+        LorentzVector.time, Fin.isValue, LorentzVector.space, Function.comp_apply, of_apply,
+        cons_val', cons_val_zero, empty_val', cons_val_fin_one, cons_val_one, head_cons,
+        head_fin_const, add_sub_sub_cancel, add_re, ofReal_re]
       ring
   right_inv x := by
     simp only [toSelfAdjointMatrix', toMatrix, LorentzVector.time, fromSelfAdjointMatrix', one_div,
diff --git a/HepLean/SpaceTime/LorentzVector/Basic.lean b/HepLean/SpaceTime/LorentzVector/Basic.lean
index aa6cae6..f1d2922 100644
--- a/HepLean/SpaceTime/LorentzVector/Basic.lean
+++ b/HepLean/SpaceTime/LorentzVector/Basic.lean
@@ -74,12 +74,12 @@ lemma decomp_stdBasis (v : LorentzVector d) : ∑ i, v i • e i = v := by
   funext ν
   rw [Finset.sum_apply]
   rw [Finset.sum_eq_single_of_mem ν]
-  · simp [HSMul.hSMul, SMul.smul, stdBasis, Pi.basisFun_apply]
+  · simp only [HSMul.hSMul, SMul.smul, stdBasis]
     erw [Pi.basisFun_apply]
     simp only [Pi.single_eq_same, mul_one]
   · exact Finset.mem_univ ν
   · intros b _ hbi
-    simp [HSMul.hSMul, SMul.smul, stdBasis, Pi.basisFun_apply]
+    simp only [HSMul.hSMul, SMul.smul, stdBasis, mul_eq_zero]
     erw [Pi.basisFun_apply]
     simp only [Pi.single]
     apply Or.inr $ Function.update_noteq (id (Ne.symm hbi)) 1 0
diff --git a/HepLean/SpaceTime/LorentzVector/LorentzAction.lean b/HepLean/SpaceTime/LorentzVector/LorentzAction.lean
index 34cb52c..33b6201 100644
--- a/HepLean/SpaceTime/LorentzVector/LorentzAction.lean
+++ b/HepLean/SpaceTime/LorentzVector/LorentzAction.lean
@@ -32,7 +32,7 @@ lemma rep_apply_stdBasis (g : LorentzGroup d) (μ : Fin 1 ⊕ Fin d) :
   simp only [rep_apply, Fintype.sum_sum_type, Finset.univ_unique, Fin.default_eq_zero, Fin.isValue,
     Finset.sum_singleton, decomp_stdBasis']
   funext ν
-  simp [LorentzVector.stdBasis, Pi.basisFun_apply]
+  simp only [stdBasis, Matrix.transpose_apply]
   erw [Pi.basisFun_apply, Matrix.mulVec_single_one]
   rfl
 
diff --git a/HepLean/SpaceTime/LorentzVector/NormOne.lean b/HepLean/SpaceTime/LorentzVector/NormOne.lean
index ec2d3d5..9d18391 100644
--- a/HepLean/SpaceTime/LorentzVector/NormOne.lean
+++ b/HepLean/SpaceTime/LorentzVector/NormOne.lean
@@ -114,7 +114,7 @@ lemma not_mem_iff : v ∉ FuturePointing d ↔ v.1.time ≤ 0 := by
   refine Iff.intro (fun h => ?_) (fun h => ?_)
   · exact le_of_not_lt ((mem_iff v).mp.mt h)
   · have h1 := (mem_iff v).mp.mt
-    simp at h1
+    simp only [LorentzVector.time, Fin.isValue, not_lt] at h1
     exact h1 h
 
 lemma not_mem_iff_neg : v ∉ FuturePointing d ↔ neg v ∈ FuturePointing d := by
diff --git a/HepLean/SpaceTime/MinkowskiMetric.lean b/HepLean/SpaceTime/MinkowskiMetric.lean
index fbc2553..b56a04a 100644
--- a/HepLean/SpaceTime/MinkowskiMetric.lean
+++ b/HepLean/SpaceTime/MinkowskiMetric.lean
@@ -36,7 +36,7 @@ scoped[minkowskiMatrix] notation "η" => minkowskiMatrix
 
 @[simp]
 lemma sq : @minkowskiMatrix d * minkowskiMatrix = 1 := by
-  simp [minkowskiMatrix, LieAlgebra.Orthogonal.indefiniteDiagonal]
+  simp only [minkowskiMatrix, LieAlgebra.Orthogonal.indefiniteDiagonal, diagonal_mul_diagonal]
   ext1 i j
   rcases i with i | i <;> rcases j with j | j
   · simp only [diagonal, of_apply, Sum.inl.injEq, Sum.elim_inl, mul_one]
@@ -70,9 +70,7 @@ lemma η_apply_mul_η_apply_diag (μ : Fin 1 ⊕ Fin d) : η μ μ * η μ μ =
 
 lemma as_block : @minkowskiMatrix d = (
     Matrix.fromBlocks (1 : Matrix (Fin 1) (Fin 1) ℝ) 0 0 (-1 : Matrix (Fin d) (Fin d) ℝ)) := by
-  rw [minkowskiMatrix]
-  simp [LieAlgebra.Orthogonal.indefiniteDiagonal]
-  rw [← fromBlocks_diagonal]
+  rw [minkowskiMatrix, LieAlgebra.Orthogonal.indefiniteDiagonal, ← fromBlocks_diagonal]
   refine fromBlocks_inj.mpr ?_
   simp only [diagonal_one, true_and]
   funext i j
@@ -291,7 +289,7 @@ lemma matrix_eq_iff_eq_forall' : (∀ v, Λ *ᵥ v= Λ' *ᵥ v) ↔ ∀ w v, ⟪
     refine sub_eq_zero.1 ?_
     have h1 := h v
     rw [nondegenerate] at h1
-    simp [sub_mulVec] at h1
+    simp only [sub_mulVec] at h1
     exact h1
 
 lemma matrix_eq_iff_eq_forall : Λ = Λ' ↔ ∀ w v, ⟪v, Λ *ᵥ w⟫ₘ = ⟪v, Λ' *ᵥ w⟫ₘ := by
@@ -334,7 +332,8 @@ lemma on_basis (μ ν : Fin 1 ⊕ Fin d) : ⟪e μ, e ν⟫ₘ = η μ ν := by
   rw [basis_left, stdBasis_apply]
   by_cases h : μ = ν
   · simp [h]
-  · simp [h, LieAlgebra.Orthogonal.indefiniteDiagonal, minkowskiMatrix]
+  · simp only [minkowskiMatrix, LieAlgebra.Orthogonal.indefiniteDiagonal, diagonal_apply_eq,
+    mul_ite, mul_one, mul_zero, ne_eq, h, not_false_eq_true, diagonal_apply_ne, ite_eq_right_iff]
     exact fun a => False.elim (h (id (Eq.symm a)))
 
 lemma matrix_apply_stdBasis (ν μ : Fin 1 ⊕ Fin d) :
diff --git a/HepLean/Tensors/IndexNotation/IndexList/Basic.lean b/HepLean/Tensors/IndexNotation/IndexList/Basic.lean
index cf19178..402b482 100644
--- a/HepLean/Tensors/IndexNotation/IndexList/Basic.lean
+++ b/HepLean/Tensors/IndexNotation/IndexList/Basic.lean
@@ -212,10 +212,8 @@ def appendInl : Fin l.length ↪ Fin (l ++ l2).length where
 /-- The inclusion of the indices of `l2` into the indices of `l ++ l2`. -/
 def appendInr : Fin l2.length ↪ Fin (l ++ l2).length where
   toFun := appendEquiv ∘ Sum.inr
-  inj' := by
-    intro i j h
-    simp [Function.comp] at h
-    exact h
+  inj' i j h := by
+    simpa only [Function.comp, EmbeddingLike.apply_eq_iff_eq, Sum.inr.injEq] using h
 
 @[simp]
 lemma appendInl_appendEquiv :
@@ -315,7 +313,7 @@ lemma filter_sort_comm {n : ℕ} (s : Finset (Fin n)) (p : Fin n → Prop) [Deci
       intro i j h1 _ _
       have hs : List.Sorted (fun i j => i ≤ j) (List.mergeSort (fun i j => i ≤ j) m) := by
         exact List.sorted_mergeSort (fun i j => i ≤ j) m
-      simp [List.Sorted] at hs
+      simp only [List.Sorted] at hs
       rw [List.pairwise_iff_get] at hs
       exact hs i j h1
     have hp1 : (List.mergeSort (fun i j => i ≤ j) m).Perm m := by
diff --git a/HepLean/Tensors/IndexNotation/IndexList/Color.lean b/HepLean/Tensors/IndexNotation/IndexList/Color.lean
index aa0aafd..db2322f 100644
--- a/HepLean/Tensors/IndexNotation/IndexList/Color.lean
+++ b/HepLean/Tensors/IndexNotation/IndexList/Color.lean
@@ -105,7 +105,8 @@ lemma countColorQuot_eq_countId_iff_of_isSome (hl : l.OnlyUniqueDuals) (i : Fin
   rcases l.filter_id_of_countId_eq_two hi1 with hf | hf
   all_goals
     erw [hf]
-    simp [List.countP, List.countP.go]
+    simp only [List.countP, List.countP.go, List.get_eq_getElem, true_or, decide_True,
+      Bool.decide_or, zero_add, Nat.reduceAdd, cond_true, List.length_cons, List.length_singleton]
     refine Iff.intro (fun h => ?_) (fun h => ?_)
     · by_contra hn
       have hn' : (decide (l.val[↑i].toColor = l.val[↑((l.getDual? i).get hi)].toColor) ||
diff --git a/HepLean/Tensors/IndexNotation/IndexList/Subperm.lean b/HepLean/Tensors/IndexNotation/IndexList/Subperm.lean
index fa7cb97..3c460f1 100644
--- a/HepLean/Tensors/IndexNotation/IndexList/Subperm.lean
+++ b/HepLean/Tensors/IndexNotation/IndexList/Subperm.lean
@@ -67,7 +67,7 @@ lemma trans (h1 : l.Subperm l2) (h2 : l2.Subperm l3) : l.Subperm l3 := by
 lemma fst_eq_contrIndexList (h : l.Subperm l2) : l.contrIndexList = l := by
   rw [iff_countId] at *
   apply ext
-  simp [contrIndexList]
+  simp only [contrIndexList, List.filter_eq_self, decide_eq_true_eq]
   intro I hI
   have h' := countId_mem l I hI
   have hI' := h I
diff --git a/scripts/MetaPrograms/free_simps.lean b/scripts/MetaPrograms/free_simps.lean
index 15f437a..9e32c9d 100644
--- a/scripts/MetaPrograms/free_simps.lean
+++ b/scripts/MetaPrograms/free_simps.lean
@@ -63,13 +63,17 @@ unsafe def processAllFiles : IO Unit := do
     ((IO.asTask $ IO.Process.run
     {cmd := "lake", args := #["exe", "free_simps", f.toString]}), f)
   tasks.toList.enum.forM fun (n, (t, path)) => do
-    println! "{n} of {tasks.toList.length}: {path}"
     let tn ← IO.wait (← t)
     match tn with
-    | .ok x => println! x
+    | .ok x =>
+      if x ≠ "" then
+      println! "{n} of {tasks.toList.length}: {path}"
+      println! x
     | .error _ => println! "Error"
 
 unsafe def main (args : List String) : IO Unit := do
   match args with
   | [path] => transverseTactics path visitTacticInfo
-  | _ => processAllFiles
+  | _ =>
+    processAllFiles
+    IO.println "Finished"