diff --git a/Source/DiabloUI/settingsmenu.cpp b/Source/DiabloUI/settingsmenu.cpp
index 9d5bf5098..c47032720 100644
--- a/Source/DiabloUI/settingsmenu.cpp
+++ b/Source/DiabloUI/settingsmenu.cpp
@@ -381,15 +381,13 @@ void UiSettingsMenu()
 
 		switch (shownMenu) {
 		case ShownMenuType::Categories: {
-			size_t catCount = 0;
 			size_t catIndex = 0;
-			for (auto *pCategory : sgOptions.GetCategories()) {
-				for (auto *pEntry : pCategory->GetEntries()) {
+			for (OptionCategoryBase *pCategory : sgOptions.GetCategories()) {
+				for (OptionEntryBase *pEntry : pCategory->GetEntries()) {
 					if (!IsValidEntry(pEntry))
 						continue;
 					if (selectedCategory == pCategory)
 						itemToSelect = vecDialogItems.size();
-					catCount += 1;
 					vecDialogItems.push_back(std::make_unique<UiListItem>(pCategory->GetName(), static_cast<int>(catIndex), UiFlags::ColorUiGold));
 					break;
 				}
@@ -397,7 +395,7 @@ void UiSettingsMenu()
 			}
 		} break;
 		case ShownMenuType::Settings: {
-			for (auto *pEntry : selectedCategory->GetEntries()) {
+			for (OptionEntryBase *pEntry : selectedCategory->GetEntries()) {
 				if (!IsValidEntry(pEntry))
 					continue;
 				if (selectedOption == pEntry)
diff --git a/Source/controls/modifier_hints.cpp b/Source/controls/modifier_hints.cpp
index 9c702dc07..455a00eb4 100644
--- a/Source/controls/modifier_hints.cpp
+++ b/Source/controls/modifier_hints.cpp
@@ -33,12 +33,6 @@ constexpr int CircleTop = 101;
 /** Spell icon side size. */
 constexpr int IconSize = 37;
 
-/** Spell icon text right margin. */
-constexpr int IconSizeTextMarginRight = 3;
-
-/** Spell icon text top margin. */
-constexpr int IconSizeTextMarginTop = 2;
-
 constexpr int HintBoxSize = 39;
 constexpr int HintBoxMargin = 5;
 
diff --git a/Source/engine/render/scrollrt.cpp b/Source/engine/render/scrollrt.cpp
index a0b3bcbf4..82dee7fc8 100644
--- a/Source/engine/render/scrollrt.cpp
+++ b/Source/engine/render/scrollrt.cpp
@@ -179,21 +179,6 @@ Bitset2d<MAXDUNX, MAXDUNY> dRendered;
 
 int lastFpsUpdateInMs;
 
-const char *const PlayerModeNames[] = {
-	"standing",
-	"walking (1)",
-	"walking (2)",
-	"walking (3)",
-	"attacking (melee)",
-	"attacking (ranged)",
-	"blocking",
-	"getting hit",
-	"dying",
-	"casting a spell",
-	"changing levels",
-	"quitting"
-};
-
 Rectangle PrevCursorRect;
 
 void BlitCursor(uint8_t *dst, uint32_t dstPitch, uint8_t *src, uint32_t srcPitch, uint32_t srcWidth, uint32_t srcHeight)
diff --git a/Source/misdat.cpp b/Source/misdat.cpp
index ef92bcd83..ea56b18d9 100644
--- a/Source/misdat.cpp
+++ b/Source/misdat.cpp
@@ -160,7 +160,6 @@ const std::array<uint8_t, 16> MissileAnimLengths[] {
 	{},
 	Repeat(1),
 	Repeat(4),
-	Repeat(5),
 	Repeat(6),
 	Repeat(7),
 	Repeat(8),
@@ -183,24 +182,23 @@ const std::array<uint8_t, 16> MissileAnimLengths[] {
 constexpr uint8_t AnimLen_0 = 0;        // NOLINT(readability-identifier-naming)
 constexpr uint8_t AnimLen_1 = 1;        // NOLINT(readability-identifier-naming)
 constexpr uint8_t AnimLen_4 = 2;        // NOLINT(readability-identifier-naming)
-constexpr uint8_t AnimLen_5 = 3;        // NOLINT(readability-identifier-naming)
-constexpr uint8_t AnimLen_6 = 4;        // NOLINT(readability-identifier-naming)
-constexpr uint8_t AnimLen_7 = 5;        // NOLINT(readability-identifier-naming)
-constexpr uint8_t AnimLen_8 = 6;        // NOLINT(readability-identifier-naming)
-constexpr uint8_t AnimLen_9 = 7;        // NOLINT(readability-identifier-naming)
-constexpr uint8_t AnimLen_10 = 8;       // NOLINT(readability-identifier-naming)
-constexpr uint8_t AnimLen_12 = 9;       // NOLINT(readability-identifier-naming)
-constexpr uint8_t AnimLen_13 = 10;      // NOLINT(readability-identifier-naming)
-constexpr uint8_t AnimLen_14 = 11;      // NOLINT(readability-identifier-naming)
-constexpr uint8_t AnimLen_15 = 12;      // NOLINT(readability-identifier-naming)
-constexpr uint8_t AnimLen_16 = 13;      // NOLINT(readability-identifier-naming)
-constexpr uint8_t AnimLen_17 = 14;      // NOLINT(readability-identifier-naming)
-constexpr uint8_t AnimLen_19 = 15;      // NOLINT(readability-identifier-naming)
-constexpr uint8_t AnimLen_20 = 16;      // NOLINT(readability-identifier-naming)
-constexpr uint8_t AnimLen_9_4 = 17;     // NOLINT(readability-identifier-naming)
-constexpr uint8_t AnimLen_15_14_3 = 18; // NOLINT(readability-identifier-naming)
-constexpr uint8_t AnimLen_13_11 = 19;   // NOLINT(readability-identifier-naming)
-constexpr uint8_t AnimLen_16x8_8 = 20;  // NOLINT(readability-identifier-naming)
+constexpr uint8_t AnimLen_6 = 3;        // NOLINT(readability-identifier-naming)
+constexpr uint8_t AnimLen_7 = 4;        // NOLINT(readability-identifier-naming)
+constexpr uint8_t AnimLen_8 = 5;        // NOLINT(readability-identifier-naming)
+constexpr uint8_t AnimLen_9 = 6;        // NOLINT(readability-identifier-naming)
+constexpr uint8_t AnimLen_10 = 7;       // NOLINT(readability-identifier-naming)
+constexpr uint8_t AnimLen_12 = 8;       // NOLINT(readability-identifier-naming)
+constexpr uint8_t AnimLen_13 = 9;       // NOLINT(readability-identifier-naming)
+constexpr uint8_t AnimLen_14 = 10;      // NOLINT(readability-identifier-naming)
+constexpr uint8_t AnimLen_15 = 11;      // NOLINT(readability-identifier-naming)
+constexpr uint8_t AnimLen_16 = 12;      // NOLINT(readability-identifier-naming)
+constexpr uint8_t AnimLen_17 = 13;      // NOLINT(readability-identifier-naming)
+constexpr uint8_t AnimLen_19 = 14;      // NOLINT(readability-identifier-naming)
+constexpr uint8_t AnimLen_20 = 15;      // NOLINT(readability-identifier-naming)
+constexpr uint8_t AnimLen_9_4 = 16;     // NOLINT(readability-identifier-naming)
+constexpr uint8_t AnimLen_15_14_3 = 17; // NOLINT(readability-identifier-naming)
+constexpr uint8_t AnimLen_13_11 = 18;   // NOLINT(readability-identifier-naming)
+constexpr uint8_t AnimLen_16x8_8 = 19;  // NOLINT(readability-identifier-naming)
 
 } // namespace