Index: source/lib/res/h_mgr.cpp
===================================================================
--- source/lib/res/h_mgr.cpp
+++ source/lib/res/h_mgr.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013 Wildfire Games
+/* Copyright (c) 2017 Wildfire Games
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
@@ -96,7 +96,6 @@
 //   (field width determines maximum unambiguous resource allocs)
 typedef i64 Tag;
 #define TAG_BITS 48
-static const u64 TAG_MASK = 0xFFFFFFFF;	// safer than (1 << 32) - 1
 
 // make sure both fields fit within a Handle variable
 cassert(IDX_BITS + TAG_BITS <= sizeof(Handle)*CHAR_BIT);
@@ -109,13 +108,6 @@
 	return (size_t)(h & IDX_MASK) - 1;
 }
 
-// return the handle's tag field.
-// no error checking!
-static inline Tag h_tag(Handle h)
-{
-	return h >> IDX_BITS;
-}
-
 // build a handle from index and tag.
 // can't fail.
 static inline Handle handle(size_t idx, u64 tag)
Index: source/ps/XML/Xeromyces.cpp
===================================================================
--- source/ps/XML/Xeromyces.cpp
+++ source/ps/XML/Xeromyces.cpp
@@ -377,7 +377,6 @@
 	// Version
 	writeBuffer.Append(&XMBVersion, 4);
 
-	std::set<std::string>::iterator it;
 	u32 i;
 
 	// Find the unique element/attribute names
Index: source/soundmanager/scripting/SoundGroup.h
===================================================================
--- source/soundmanager/scripting/SoundGroup.h
+++ source/soundmanager/scripting/SoundGroup.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2016 Wildfire Games.
+/* Copyright (C) 2017 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -120,7 +120,6 @@
 	VfsPath m_filepath; // the file path for the list of sound file resources
 
 	float m_CurTime; // Time elapsed since soundgroup was created
-	float m_TimeWindow; // The Intensity Threshold Window
 	size_t m_IntensityThreshold; // the allowable intensity before a sound switch
 	size_t m_Intensity;  // our current intensity (number of sounds played since m_CurTime - m_TimeWindow)
 	float m_Decay;
Index: source/soundmanager/scripting/SoundGroup.cpp
===================================================================
--- source/soundmanager/scripting/SoundGroup.cpp
+++ source/soundmanager/scripting/SoundGroup.cpp
@@ -1,4 +1,4 @@
-/* Copyright (C) 2015 Wildfire Games.
+/* Copyright (C) 2017 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -46,9 +46,6 @@
 
 #define PI 3.14126f
 
-
-static const bool DISABLE_INTENSITY = true; // disable for now since it's broken
-
 void CSoundGroup::SetGain(float gain)
 {
 	gain = std::min(gain, 1.0f);
@@ -75,7 +72,6 @@
 	m_ConeOuterAngle = 360.0f;
 	m_Decay = 3.0f;
 	m_IntensityThreshold = 3;
-	// WARNING: m_TimeWindow is currently unused and uninitialized
 }
 
 CSoundGroup::CSoundGroup()