diff --git a/3d/Assets/AVProVideo/Demos/Common/MediaPlayerUI/MediaPlayerUI.cs b/3d/Assets/AVProVideo/Demos/Common/MediaPlayerUI/MediaPlayerUI.cs
index 15c2de0..078d079 100644
--- a/3d/Assets/AVProVideo/Demos/Common/MediaPlayerUI/MediaPlayerUI.cs
+++ b/3d/Assets/AVProVideo/Demos/Common/MediaPlayerUI/MediaPlayerUI.cs
@@ -547,7 +547,7 @@ namespace RenderHeads.Media.AVProVideo.Demos
 			{
 				if (_mediaPlayer)
 				{
-					// TODO: remove this
+					
 					/*if (mp.Control != null)
 					{
 						_sliderVolume.value = mp.Control.GetVolume();
diff --git a/3d/Assets/AVProVideo/Editor/Scripts/Components/MediaPlayerEditor_Subtitles.cs b/3d/Assets/AVProVideo/Editor/Scripts/Components/MediaPlayerEditor_Subtitles.cs
index 5047695..f9baaa7 100644
--- a/3d/Assets/AVProVideo/Editor/Scripts/Components/MediaPlayerEditor_Subtitles.cs
+++ b/3d/Assets/AVProVideo/Editor/Scripts/Components/MediaPlayerEditor_Subtitles.cs
@@ -23,7 +23,7 @@ namespace RenderHeads.Media.AVProVideo.Editor
 
 		private void OnInspectorGUI_Subtitles()
 		{
-			// TODO: add support for multiple targets?
+			
 			MediaPlayer media = (this.target) as MediaPlayer;
 
 			//EditorGUILayout.BeginVertical();
diff --git a/3d/Assets/AVProVideo/Editor/Scripts/RecentItems.cs b/3d/Assets/AVProVideo/Editor/Scripts/RecentItems.cs
index 98fafa6..4d42565 100644
--- a/3d/Assets/AVProVideo/Editor/Scripts/RecentItems.cs
+++ b/3d/Assets/AVProVideo/Editor/Scripts/RecentItems.cs
@@ -16,7 +16,7 @@ namespace RenderHeads.Media.AVProVideo.Editor
 
 		private static List<string> _recentFiles = new List<string>(MaxRecentItems);
 		private static List<string> _recentUrls = new List<string>(MaxRecentItems);
-		// TODO: add a list for favourites to allow user to create their own list?
+		
 
 		public static List<string> Files { get { return _recentFiles; } }
 		public static List<string> Urls { get { return _recentUrls; } }
diff --git a/3d/Assets/AVProVideo/Runtime/Scripts/Components/ApplyToMesh.cs b/3d/Assets/AVProVideo/Runtime/Scripts/Components/ApplyToMesh.cs
index f4441d4..b033f28 100644
--- a/3d/Assets/AVProVideo/Runtime/Scripts/Components/ApplyToMesh.cs
+++ b/3d/Assets/AVProVideo/Runtime/Scripts/Components/ApplyToMesh.cs
@@ -61,7 +61,7 @@ namespace RenderHeads.Media.AVProVideo
 			{
 				if (_renderer)
 				{
-					// TODO: Remove from renderer
+					
 				}
 				_renderer = renderer;
 				if (_renderer)
diff --git a/3d/Assets/AVProVideo/Runtime/Scripts/Components/PlaylistMediaPlayer.cs b/3d/Assets/AVProVideo/Runtime/Scripts/Components/PlaylistMediaPlayer.cs
index 7937709..69a3be7 100644
--- a/3d/Assets/AVProVideo/Runtime/Scripts/Components/PlaylistMediaPlayer.cs
+++ b/3d/Assets/AVProVideo/Runtime/Scripts/Components/PlaylistMediaPlayer.cs
@@ -549,7 +549,7 @@ namespace RenderHeads.Media.AVProVideo
 				{
 					NextPlayer.Play();
 				}
-				// TODO: We probably want to wait until the new frame arrives before swapping after a Rewind()
+				
 				SwapPlayers();
 			}
 			else