--- a/CMake/InstallResources.cmake	1989-12-31 19:00:00.000000000 -0500
+++ b/CMake/InstallResources.cmake	2018-01-17 14:20:52.618886229 -0500
@@ -121,9 +121,6 @@
 # create plugins.cfg
 configure_file(${OGRE_TEMPLATES_DIR}/plugins_d.cfg.in ${OGRE_BINARY_DIR}/inst/bin/debug/plugins_d.cfg)
 configure_file(${OGRE_TEMPLATES_DIR}/plugins.cfg.in ${OGRE_BINARY_DIR}/inst/bin/release/plugins.cfg)
-# create quakemap.cfg
-configure_file(${OGRE_TEMPLATES_DIR}/quakemap.cfg.in ${OGRE_BINARY_DIR}/inst/bin/debug/quakemap_d.cfg)
-configure_file(${OGRE_TEMPLATES_DIR}/quakemap.cfg.in ${OGRE_BINARY_DIR}/inst/bin/release/quakemap.cfg)
 # create samples.cfg
 configure_file(${OGRE_TEMPLATES_DIR}/samples_d.cfg.in ${OGRE_BINARY_DIR}/inst/bin/debug/samples_d.cfg)
 configure_file(${OGRE_TEMPLATES_DIR}/samples.cfg.in ${OGRE_BINARY_DIR}/inst/bin/release/samples.cfg)
@@ -137,7 +134,6 @@
   ${OGRE_BINARY_DIR}/inst/bin/debug/plugins_d.cfg
   ${OGRE_BINARY_DIR}/inst/bin/debug/samples_d.cfg
   ${OGRE_BINARY_DIR}/inst/bin/debug/tests_d.cfg
-  ${OGRE_BINARY_DIR}/inst/bin/debug/quakemap_d.cfg
   DESTINATION "${OGRE_CFG_INSTALL_PATH}" CONFIGURATIONS Debug
 )
 install(FILES 
@@ -145,7 +141,6 @@
   ${OGRE_BINARY_DIR}/inst/bin/release/plugins.cfg
   ${OGRE_BINARY_DIR}/inst/bin/release/samples.cfg
   ${OGRE_BINARY_DIR}/inst/bin/release/tests.cfg
-  ${OGRE_BINARY_DIR}/inst/bin/release/quakemap.cfg
   DESTINATION "${OGRE_CFG_INSTALL_PATH}"
   CONFIGURATIONS Release RelWithDebInfo MinSizeRel None ""
 )
@@ -157,7 +152,6 @@
     ${OGRE_BINARY_DIR}/inst/bin/release/plugins.cfg
     ${OGRE_BINARY_DIR}/inst/bin/release/samples.cfg
     ${OGRE_BINARY_DIR}/inst/bin/release/tests.cfg
-    ${OGRE_BINARY_DIR}/inst/bin/release/quakemap.cfg
     DESTINATION "${OGRE_CFG_INSTALL_PATH}"
   )
 endif()
@@ -209,11 +203,6 @@
   configure_file(${OGRE_TEMPLATES_DIR}/plugins.cfg.in ${OGRE_BINARY_DIR}/bin/release/plugins.cfg)
   configure_file(${OGRE_TEMPLATES_DIR}/plugins.cfg.in ${OGRE_BINARY_DIR}/bin/relwithdebinfo/plugins.cfg)
   configure_file(${OGRE_TEMPLATES_DIR}/plugins.cfg.in ${OGRE_BINARY_DIR}/bin/minsizerel/plugins.cfg)
-  # create quakemap.cfg
-  configure_file(${OGRE_TEMPLATES_DIR}/quakemap.cfg.in ${OGRE_BINARY_DIR}/bin/debug/quakemap_d.cfg)
-  configure_file(${OGRE_TEMPLATES_DIR}/quakemap.cfg.in ${OGRE_BINARY_DIR}/bin/release/quakemap.cfg)
-  configure_file(${OGRE_TEMPLATES_DIR}/quakemap.cfg.in ${OGRE_BINARY_DIR}/bin/relwithdebinfo/quakemap.cfg)
-  configure_file(${OGRE_TEMPLATES_DIR}/quakemap.cfg.in ${OGRE_BINARY_DIR}/bin/minsizerel/quakemap.cfg)
   # create samples.cfg
   configure_file(${OGRE_TEMPLATES_DIR}/samples_d.cfg.in ${OGRE_BINARY_DIR}/bin/debug/samples_d.cfg)
   configure_file(${OGRE_TEMPLATES_DIR}/samples.cfg.in ${OGRE_BINARY_DIR}/bin/release/samples.cfg)
@@ -229,8 +218,6 @@
   configure_file(${OGRE_TEMPLATES_DIR}/resources.cfg.in ${OGRE_BINARY_DIR}/bin/resources.cfg)
   # create plugins.cfg
   configure_file(${OGRE_TEMPLATES_DIR}/plugins.cfg.in ${OGRE_BINARY_DIR}/bin/plugins.cfg)
-  # create quakemap.cfg
-  configure_file(${OGRE_TEMPLATES_DIR}/quakemap.cfg.in ${OGRE_BINARY_DIR}/bin/quakemap.cfg)
   # create samples.cfg
   configure_file(${OGRE_TEMPLATES_DIR}/samples.cfg.in ${OGRE_BINARY_DIR}/bin/samples.cfg)
   # create tests.cfg
--- a/CMake/Templates/Android_resources.cfg.in	1989-12-31 19:00:00.000000000 -0500
+++ b/CMake/Templates/Android_resources.cfg.in	2018-01-17 14:22:47.293842892 -0500
@@ -14,7 +14,6 @@
 APKFileSystem=/materials/scripts
 APKFileSystem=/materials/textures
 APKFileSystem=/materials/textures/glTF2_IBL
-APKFileSystem=/materials/textures/nvidia
 APKFileSystem=/models
 APKFileSystem=/particle
 APKFileSystem=/materials/scripts/SSAO
--- a/CMake/Templates/SDK_CMakeLists.txt.in	1989-12-31 19:00:00.000000000 -0500
+++ b/CMake/Templates/SDK_CMakeLists.txt.in	2018-01-17 14:24:12.493429198 -0500
@@ -244,7 +244,6 @@
   configure_file(${OGRE_SOURCE_DIR}/plugins.cfg ${OGRE_BINARY_DIR}/bin/plugins.cfg COPYONLY)
   configure_file(${OGRE_SOURCE_DIR}/resources.cfg ${OGRE_BINARY_DIR}/bin/resources.cfg COPYONLY)
   configure_file(${OGRE_SOURCE_DIR}/samples.cfg ${OGRE_BINARY_DIR}/bin/samples.cfg COPYONLY)
-  configure_file(${OGRE_SOURCE_DIR}/quakemap.cfg ${OGRE_BINARY_DIR}/bin/quakemap.cfg COPYONLY)
 endif ()
 
 if (MINGW)
--- a/CMake/Templates/demomedia.wxi.in	1989-12-31 19:00:00.000000000 -0500
+++ b/CMake/Templates/demomedia.wxi.in	2018-01-17 14:28:08.219728763 -0500
@@ -295,13 +295,6 @@
             <ComponentRef Id="cmpA1FEB51B0386689568AAFC22E0D71B6B" />
             <ComponentRef Id="cmpA3F7363F0553143ABF1CA52A2FD433D6" />
             <ComponentRef Id="cmp0344A18C23958D312C044A6E8443CD9D" />
-            <ComponentRef Id="cmp30B19313C1A692A69AC9C275E4E5D5CC" />
-            <ComponentRef Id="cmp376B3837DF007338AC14AB58C726A8B1" />
-            <ComponentRef Id="cmp02B151F3B587EAF5AF116E6A3B09E247" />
-            <ComponentRef Id="cmpFA2310874B7C3D5229AF9BEACAF6746A" />
-            <ComponentRef Id="cmpB11E2174087D0D3FC791806231C1DBF5" />
-            <ComponentRef Id="cmpF00ABD2DB6C6A8D718E0E4B5CD6B1C09" />
-            <ComponentRef Id="cmpA603C50287BBE370F0BDF5FBE7A3233F" />
             <ComponentRef Id="cmpEA39DA48CA01586DF3412795541AD2FC" />
             <ComponentRef Id="cmp50C3E068724D3C32847EEB132308B147" />
             <ComponentRef Id="cmp78D10E140133F6977C74A8F912B2B217" />
@@ -328,8 +321,6 @@
             <ComponentRef Id="cmpDFD58144C55506C82E22CF1AC14714B8" />
             <ComponentRef Id="cmp9BF13256D468C8147B7050A93B09C032" />
             <ComponentRef Id="cmp86F908FD9E8E5FFAD0C2D9A37A098E4C" />
-            <ComponentRef Id="cmpDEED3FE7C35E18D0FA59B8BB3DF42244" />
-            <ComponentRef Id="cmp98499D3076FA7324AFE1F9F8D10FB421" />
             <ComponentRef Id="cmp532E67011B733ACE674692F6ED52775D" />
             <ComponentRef Id="cmp572AE70CCC0D85E8DA35F87B45768634" />
             <ComponentRef Id="cmp013036935784DEC9BAE62831C93EFA18" />
@@ -1338,29 +1329,6 @@
                         <Component Id="cmp0344A18C23958D312C044A6E8443CD9D" Guid="{E47FE6B7-B6BD-4FCA-A903-87281A6B8CEB}">
                             <File Id="fil39C72570EB0CBAC9AF4FF900C2D5D525" KeyPath="yes" Source="@OGRE_MEDIA_DIR_REL@\materials\textures\WoodPallet.png" />
                         </Component>
-                        <Directory Id="dir11696C93BEAB38C45931BCBDDB2A6789" Name="nvidia">
-                            <Component Id="cmp30B19313C1A692A69AC9C275E4E5D5CC" Guid="{68CA4BF9-5A51-400F-B5C2-701A4DA8D331}">
-                                <File Id="fil40BA6B2C4D12AD2C5710179390B9D2DB" KeyPath="yes" Source="@OGRE_MEDIA_DIR_REL@\materials\textures\nvidia\dirt_grayrocky_diffusespecular.dds" />
-                            </Component>
-                            <Component Id="cmp376B3837DF007338AC14AB58C726A8B1" Guid="{CF5BBEF1-4E44-46E9-8373-4FF589D19F6F}">
-                                <File Id="fil6A9EC7DE38E4F700741187344AAB9A4C" KeyPath="yes" Source="@OGRE_MEDIA_DIR_REL@\materials\textures\nvidia\dirt_grayrocky_normalheight.dds" />
-                            </Component>
-                            <Component Id="cmp02B151F3B587EAF5AF116E6A3B09E247" Guid="{EB6D162E-A67A-4CD1-948D-66B84457AFBD}">
-                                <File Id="fil30FFE3069E40D44C734E168BEB336DA0" KeyPath="yes" Source="@OGRE_MEDIA_DIR_REL@\materials\textures\nvidia\grass_green-01_diffusespecular.dds" />
-                            </Component>
-                            <Component Id="cmpFA2310874B7C3D5229AF9BEACAF6746A" Guid="{C6E468AC-67EE-44C6-9F01-69D369D966FC}">
-                                <File Id="fil4C7A93A8C53E76F5F5ED65D1F52659DD" KeyPath="yes" Source="@OGRE_MEDIA_DIR_REL@\materials\textures\nvidia\grass_green-01_normalheight.dds" />
-                            </Component>
-                            <Component Id="cmpB11E2174087D0D3FC791806231C1DBF5" Guid="{3A30B7B3-6D8D-4475-B31E-5626B54DD65B}">
-                                <File Id="fil909FAC7A36B3EA5B9F4660701BEC09F5" KeyPath="yes" Source="@OGRE_MEDIA_DIR_REL@\materials\textures\nvidia\growth_weirdfungus-03_diffusespecular.dds" />
-                            </Component>
-                            <Component Id="cmpF00ABD2DB6C6A8D718E0E4B5CD6B1C09" Guid="{EE4979FF-6320-432A-98B2-F183BCAC197A}">
-                                <File Id="fil23D0DB8C9CA160970B9C29DD8F77B5CF" KeyPath="yes" Source="@OGRE_MEDIA_DIR_REL@\materials\textures\nvidia\growth_weirdfungus-03_normalheight.dds" />
-                            </Component>
-                            <Component Id="cmpA603C50287BBE370F0BDF5FBE7A3233F" Guid="{E8AD7243-C2F2-4C00-AE8E-DC38E20927FA}">
-                                <File Id="fil6A4613F0DA3B5B562C5C68C05DFF0171" KeyPath="yes" Source="@OGRE_MEDIA_DIR_REL@\materials\textures\nvidia\TextureUsageAgreement.txt" />
-                            </Component>
-                        </Directory>
                     </Directory>
                 </Directory>
                 <Directory Id="dir01544E63CCE21518F3D56A0A93D1DC4A" Name="models">
@@ -1444,12 +1412,6 @@
                     </Component>
                 </Directory>
                 <Directory Id="dir4ABFE5E33570C5CDD587CDA5FEC53CBC" Name="packs">
-                    <Component Id="cmpDEED3FE7C35E18D0FA59B8BB3DF42244" Guid="{5B8E1BED-1BC5-4A20-BA09-9699D0AF7BFC}">
-                        <File Id="fil43F38AE712D50BF0076D8C8E08E3264C" KeyPath="yes" Source="@OGRE_MEDIA_DIR_REL@\packs\chiropteraDM.pk3" />
-                    </Component>
-                    <Component Id="cmp98499D3076FA7324AFE1F9F8D10FB421" Guid="{38CA3EF3-96E4-47D1-8B4C-682BCCF91E99}">
-                        <File Id="fil98BCB56BE20EF36A4F72F07CDADC63DE" KeyPath="yes" Source="@OGRE_MEDIA_DIR_REL@\packs\chiropteraDM.txt" />
-                    </Component>
                     <Component Id="cmp532E67011B733ACE674692F6ED52775D" Guid="{9AC3FA7E-FBDC-4448-A61B-615EF43EB923}">
                         <File Id="filC6E116063CEC1DFBE1D6B452FD089931" KeyPath="yes" Source="@OGRE_MEDIA_DIR_REL@\packs\cubemap.zip" />
                     </Component>
--- a/CMake/Templates/demos.wxs.in	1989-12-31 19:00:00.000000000 -0500
+++ b/CMake/Templates/demos.wxs.in	2018-01-17 14:28:56.977584421 -0500
@@ -39,7 +39,6 @@
             <File Source='..\bin\release\samples.cfg' Vital='yes' />
             <!-- Following config files are tweaked locally -->
             <File Source='.\resources.cfg' Vital='yes' />
-            <File Source='.\quakemap.cfg' Vital='yes' />
 
             <File Source="..\bin\release\SampleBrowser.exe" />
             <File Source='..\bin\release\Sample_BezierPatch.dll' Vital='yes' />
--- a/CMake/Templates/resources.cfg.in	1989-12-31 19:00:00.000000000 -0500
+++ b/CMake/Templates/resources.cfg.in	2018-01-17 14:29:44.348834395 -0500
@@ -14,7 +14,6 @@
 FileSystem=@OGRE_MEDIA_DIR_REL@/materials/programs
 FileSystem=@OGRE_MEDIA_DIR_REL@/materials/scripts
 FileSystem=@OGRE_MEDIA_DIR_REL@/materials/textures
-FileSystem=@OGRE_MEDIA_DIR_REL@/materials/textures/nvidia
 FileSystem=@OGRE_MEDIA_DIR_REL@/models
 FileSystem=@OGRE_MEDIA_DIR_REL@/particle
 FileSystem=@OGRE_MEDIA_DIR_REL@/DeferredShadingMedia
--- a/Docs/License.md	1989-12-31 19:00:00.000000000 -0500
+++ b/Docs/License.md	2018-01-17 14:32:09.955764022 -0500
@@ -299,35 +299,6 @@
 
 <br />
 
-<span style="font-weight: bold;">NVidia Cg<br />
-
-</span>
-<table style="text-align: left; width: 100%;" border="0" cellpadding="0" cellspacing="0">
-    <tbody>
-
-        <tr>
-            <td style="width: 20%;">Original Authors:</td>
-            <td>NVidia</td>
-        </tr>
-
-        <tr>
-            <td>Website:</td>
-            <td>http://developer.nvidia.com</td>
-        </tr>
-
-        <tr>
-            <td>Licensed Under:</td>
-            <td>Custom free license (binary only)</td>
-        </tr>
-
-        <tr>
-            <td>Needed By:</td>
-            <td>Plugin_CgProgramManager</td>
-        </tr>
-
-    </tbody>
-</table>
-<br />
 <span style="font-weight: bold;">OpenEXR<br />
 
 </span>
@@ -408,57 +379,4 @@
 
 </ul>
 
-<p class="mainheader" align="left">Art credits for demos</p>
-
-<ul>
-    <li>
-        <p style="margin-bottom: 0cm;">Matt Anderson at
-            <a href="http://www.The3dStudio.com/">www.The3dStudio.com</a> who
-            kindly gave permission for the use of some textures. These textures are used with permission of
-            <a href="http://www.the3dstudio.com/">www.The3dStudio.com</a> and may
-            not be re-distributed, sold, or given away except in the form of
-            rendered images, animations, or real time 3D applications when credit
-            is given to <a href="http://www.the3dstudio.com/">www.The3dStudio.com</a>.</p>
-    </li>
-    <li>
-        <p style="margin-bottom: 0cm;">Jonathan Clark at
-            <a href="http://www.jonathanclark.com/">http://www.jonathanclark.com</a>
-            for some Golgotha textures thet were released to the public domain.</p>
-    </li>
-    <li>
-        <p style="margin-bottom: 0cm;">The 'Raptor Assault Gunboat' mesh
-            &amp; texture are &copy; 2002 by Adrian 'cearny' Cearnau.</p>
-    </li>
-    <li>
-        <p style="margin-bottom: 0cm;">The robot andn ninja mesh and
-            animation are by <a href="http://www.psionic3d.co.uk/">Psionic</a>,
-            kindly made available from the <a href="http://www.insanesoftware.de/">CharacterFX</a>
-            site</p>
-    </li>
-    <li>
-        <p style="margin-bottom: 0cm;">The 'Razor 2' mesh is by Dennis
-            Verbeek</p>
-    </li>
-    <li>
-        <p style="margin-bottom: 0cm;">Skyboxes in cubemapJS.zip are
-            &copy;<a href="http://www.schlorb.com/">Johannes Schlorb</a>, used
-            with permission.
-        </p>
-    </li>
-    <li>
-        <p>Grass texture is courtesy of Mathias 'freezer' Walc</p>
-    </li>
-    <li>
-        <p>The 'Cuckoo' TrueType font is provided by <a href="http://www.grsites.com">http://www.grsites.com</a>.</p>
-    </li>
-    <li>SoftImage|XSI sample media files (facial.mesh, jaiqua.mesh and associated files) are provided courtesy of Avid Technology, Inc.<br />
-        &copy; 2004 Avid Technology, Inc. All rights
-        reserved. Avid is either a registered trademark or trademark of Avid
-        Technology, Inc. in the United States and/or other countries.
-    </li>
-    <li>
-        <p>The Sibenik Cathedral model by Marko Dabrovic - <a href="marko@3lhd.com">marko@3lhd.com</a>.</p>
-    </li>
-</ul>
-
 <p>Copyright &copy; 2013 by The OGRE Team</p>
--- a/Samples/BSP/include/BSP.h	1989-12-31 19:00:00.000000000 -0500
+++ b/Samples/BSP/include/BSP.h	2018-01-17 14:34:43.165692607 -0500
@@ -19,7 +19,6 @@
     {
         mInfo["Title"] = "BSP";
         mInfo["Description"] = "A demo of the indoor, or BSP (Binary Space Partition) scene manager. "
-            "Also demonstrates how to load BSP maps from Quake 3.";
         mInfo["Thumbnail"] = "thumb_bsp.png";
         mInfo["Category"] = "Geometry";
     }
@@ -42,41 +41,6 @@
 
  protected:
 
-    void locateResources()
-    {
-    	// Pick a new resource group so Q3Shader parser is correctly registered
-    	ResourceGroupManager::getSingleton().setWorldResourceGroupName("BSPWorld");
-
-        // load the Quake archive location and map name from a config file
-        ConfigFile cf;
-        cf.load(mFSLayer->getConfigFilePath("quakemap.cfg"));
-        mArchive = cf.getSetting("Archive");
-        mMap = cf.getSetting("Map");
-
-#if OGRE_PLATFORM == OGRE_PLATFORM_APPLE || OGRE_PLATFORM == OGRE_PLATFORM_APPLE_IOS
-    Ogre::String bundle = Ogre::macBundlePath();
-#elif OGRE_PLATFORM == OGRE_PLATFORM_LINUX
-    char* env_SNAP = getenv("SNAP");
-    Ogre::String bundle(env_SNAP ? env_SNAP : "");
-#endif
-
-#if OGRE_PLATFORM == OGRE_PLATFORM_APPLE || OGRE_PLATFORM == OGRE_PLATFORM_APPLE_IOS
-        // OS X does not set the working directory relative to the app,
-        // In order to make things portable on OS X we need to provide
-        // the loading with it's own bundle path location
-        if (!Ogre::StringUtil::startsWith(mArchive, "/", false)) // only adjust relative dirs
-            mArchive = bundle + "/" + mArchive;
-#elif OGRE_PLATFORM == OGRE_PLATFORM_LINUX
-            // With Ubuntu Snappy changes absolute paths are relative to the snap package.
-            if (Ogre::StringUtil::startsWith(mArchive, "/", false)) // only adjust absolute dirs
-                mArchive = bundle + mArchive;
-#endif
-
-        // add the Quake archive to the world resource group
-        ResourceGroupManager::getSingleton().addResourceLocation(mArchive, "Zip",
-                                                                 ResourceGroupManager::getSingleton().getWorldResourceGroupName(), true);
-    }
-
     void createSceneManager()
     {
         mSceneMgr = mRoot->createSceneManager("BspSceneManager");   // the BSP scene manager is required for this sample
@@ -122,10 +86,6 @@
         // set a random player starting point
         ViewPoint vp = mSceneMgr->getSuggestedViewpoint(true);
 
-        // Quake uses the Z axis as the up axis, so make necessary adjustments
-        mCameraNode->setFixedYawAxis(true, Vector3::UNIT_Z);
-        mCameraNode->pitch(Degree(90));
-
         mCameraNode->setPosition(vp.position);
         mCameraNode->rotate(vp.orientation);
 
--- a/Samples/Browser/CMakeLists.txt	1989-12-31 19:00:00.000000000 -0500
+++ b/Samples/Browser/CMakeLists.txt	2018-01-17 14:36:27.887753660 -0500
@@ -118,13 +118,11 @@
 
         ${OGRE_BINARY_DIR}/inst/bin/debug/resources_d.cfg
         ${OGRE_BINARY_DIR}/inst/bin/debug/plugins_d.cfg
-        ${OGRE_BINARY_DIR}/inst/bin/debug/quakemap_d.cfg
         ${OGRE_BINARY_DIR}/inst/bin/debug/samples_d.cfg
         ${OGRE_BINARY_DIR}/inst/bin/debug/tests_d.cfg
 
         ${OGRE_BINARY_DIR}/inst/bin/release/resources.cfg
         ${OGRE_BINARY_DIR}/inst/bin/release/plugins.cfg
-        ${OGRE_BINARY_DIR}/inst/bin/release/quakemap.cfg
         ${OGRE_BINARY_DIR}/inst/bin/release/samples.cfg
         ${OGRE_BINARY_DIR}/inst/bin/release/tests.cfg
 
@@ -149,14 +147,12 @@
     set(DEBUG_CONTENT_FILES ${DEBUG_CONTENT_FILES}
         ${CMAKE_CURRENT_BINARY_DIR}/resources_d.cfg
         ${CMAKE_CURRENT_BINARY_DIR}/plugins_d.cfg
-        ${CMAKE_CURRENT_BINARY_DIR}/quakemap_d.cfg
         ${CMAKE_CURRENT_BINARY_DIR}/samples_d.cfg
         ${CMAKE_CURRENT_BINARY_DIR}/tests_d.cfg
     )
     set(RELEASE_CONTENT_FILES ${RELEASE_CONTENT_FILES}
         ${CMAKE_CURRENT_BINARY_DIR}/resources.cfg
         ${CMAKE_CURRENT_BINARY_DIR}/plugins.cfg
-        ${CMAKE_CURRENT_BINARY_DIR}/quakemap.cfg
         ${CMAKE_CURRENT_BINARY_DIR}/samples.cfg
         ${CMAKE_CURRENT_BINARY_DIR}/tests.cfg
     )
@@ -305,7 +301,6 @@
 		COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/bin/macosx/plugins.cfg   ${OGRE_SAMPLE_CONTENTS_PATH}/Resources/
 		COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/bin/macosx/resources.cfg ${OGRE_SAMPLE_CONTENTS_PATH}/Resources/
 		COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/bin/macosx/samples.cfg   ${OGRE_SAMPLE_CONTENTS_PATH}/Resources/
-		COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/bin/macosx/quakemap.cfg  ${OGRE_SAMPLE_CONTENTS_PATH}/Resources/
 		COMMAND ln ARGS -s -f ${OGRE_SOURCE_DIR}/Media                    ${OGRE_SAMPLE_CONTENTS_PATH}/Resources/
 		COMMAND ditto ${OGRE_SOURCE_DIR}/Samples/Common/misc/SampleBrowser_OSX.icns ${OGRE_SAMPLE_CONTENTS_PATH}/Resources
 		)
@@ -315,7 +310,6 @@
 		COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/bin/plugins.cfg 		${OGRE_SAMPLE_CONTENTS_PATH}/Resources/
 		COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/bin/resources.cfg 		${OGRE_SAMPLE_CONTENTS_PATH}/Resources/
 		COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/bin/samples.cfg   		${OGRE_SAMPLE_CONTENTS_PATH}/Resources/
-		COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/bin/quakemap.cfg  		${OGRE_SAMPLE_CONTENTS_PATH}/Resources/
 		COMMAND ln ARGS -s -f ${OGRE_SOURCE_DIR}/Samples/Media     		${OGRE_SAMPLE_CONTENTS_PATH}/Resources/
 		COMMAND ditto ${OGRE_SOURCE_DIR}/Samples/Common/misc/SampleBrowser_OSX.icns ${OGRE_SAMPLE_CONTENTS_PATH}/Resources
 		)
--- a/Samples/CMakeLists.txt	1989-12-31 19:00:00.000000000 -0500
+++ b/Samples/CMakeLists.txt	2018-01-17 14:37:21.222074714 -0500
@@ -251,7 +251,6 @@
 	set(OGRE_MEDIA_DIR_TMP ${OGRE_MEDIA_DIR_REL})
 	set(OGRE_MEDIA_DIR_REL "Media")
     configure_file(${OGRE_TEMPLATES_DIR}/resources.cfg.in ${CMAKE_CURRENT_BINARY_DIR}/resources.cfg @ONLY)
-    configure_file(${OGRE_TEMPLATES_DIR}/quakemap.cfg.in ${CMAKE_CURRENT_BINARY_DIR}/quakemap.cfg @ONLY)
 	# restore
 	set(OGRE_MEDIA_DIR_REL ${OGRE_MEDIA_DIR_TMP})
     add_custom_target(demo_installer 
--- a/Samples/EndlessWorld/include/EndlessWorld.h	1989-12-31 19:00:00.000000000 -0500
+++ b/Samples/EndlessWorld/include/EndlessWorld.h	2018-01-17 14:38:18.842873919 -0500
@@ -312,17 +312,6 @@
 		defaultimp.inputScale = 600;
 		defaultimp.minBatchSize = 33;
 		defaultimp.maxBatchSize = 65;
-		// textures
-		defaultimp.layerList.resize(3);
-		defaultimp.layerList[0].worldSize = 100;
-		defaultimp.layerList[0].textureNames.push_back("dirt_grayrocky_diffusespecular.dds");
-		defaultimp.layerList[0].textureNames.push_back("dirt_grayrocky_normalheight.dds");
-		defaultimp.layerList[1].worldSize = 30;
-		defaultimp.layerList[1].textureNames.push_back("grass_green-01_diffusespecular.dds");
-		defaultimp.layerList[1].textureNames.push_back("grass_green-01_normalheight.dds");
-		defaultimp.layerList[2].worldSize = 200;
-		defaultimp.layerList[2].textureNames.push_back("growth_weirdfungus-03_diffusespecular.dds");
-		defaultimp.layerList[2].textureNames.push_back("growth_weirdfungus-03_normalheight.dds");
 	}
 
 	/*-----------------------------------------------------------------------------
--- a/Samples/Media/volumeTerrain/triplanarReference.material	1989-12-31 19:00:00.000000000 -0500
+++ b/Samples/Media/volumeTerrain/triplanarReference.material	2018-01-17 14:39:19.330213722 -0500
@@ -9,9 +9,6 @@
             rtshader_system
             {
                 lighting_stage ffp
-                // Texturescale, Plateau-size (0 to 0.57, not bigger to avoid division by zero!), transition-speed
-                // Texture from x, from y, from z
-                triplanarTexturing 0.1 0.2 2.0 dirt_grayrocky_diffusespecular.dds grass_green-01_diffusespecular.dds growth_weirdfungus-03_diffusespecular.dds
             }
         }
     }
--- a/Samples/Terrain/include/Terrain.h	1989-12-31 19:00:00.000000000 -0500
+++ b/Samples/Terrain/include/Terrain.h	2018-01-17 14:40:31.710363819 -0500
@@ -527,17 +527,6 @@
         defaultimp.inputScale = 600;
         defaultimp.minBatchSize = 33;
         defaultimp.maxBatchSize = 65;
-        // textures
-        defaultimp.layerList.resize(3);
-        defaultimp.layerList[0].worldSize = 100;
-        defaultimp.layerList[0].textureNames.push_back("dirt_grayrocky_diffusespecular.dds");
-        defaultimp.layerList[0].textureNames.push_back("dirt_grayrocky_normalheight.dds");
-        defaultimp.layerList[1].worldSize = 30;
-        defaultimp.layerList[1].textureNames.push_back("grass_green-01_diffusespecular.dds");
-        defaultimp.layerList[1].textureNames.push_back("grass_green-01_normalheight.dds");
-        defaultimp.layerList[2].worldSize = 200;
-        defaultimp.layerList[2].textureNames.push_back("growth_weirdfungus-03_diffusespecular.dds");
-        defaultimp.layerList[2].textureNames.push_back("growth_weirdfungus-03_normalheight.dds");
     }
 
     void addTextureShadowDebugOverlay(TrayLocation loc, size_t num)
--- a/Tests/CMakeLists.txt	1989-12-31 19:00:00.000000000 -0500
+++ b/Tests/CMakeLists.txt	2018-01-17 14:41:36.227526393 -0500
@@ -205,8 +205,6 @@
         ${OGRE_TEST_CONTENTS_PATH}/Resources/
         COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/bin/samples.cfg
         ${OGRE_TEST_CONTENTS_PATH}/Resources/
-        COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/bin/quakemap.cfg
-        ${OGRE_TEST_CONTENTS_PATH}/Resources/
         COMMAND ditto
         ${OGRE_SOURCE_DIR}/Samples/Media/ ${OGRE_TEST_CONTENTS_PATH}/Resources/Media/
         COMMAND ditto
--- a/Tests/VisualTests/Context/CMakeLists.txt	1989-12-31 19:00:00.000000000 -0500
+++ b/Tests/VisualTests/Context/CMakeLists.txt	2018-01-17 14:42:24.515402721 -0500
@@ -140,8 +140,6 @@
 		${OGRE_TESTCONTEXT_CONTENTS_PATH}/Resources/
 		COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/bin/resources.cfg
 		${OGRE_TESTCONTEXT_CONTENTS_PATH}/Resources/
-		COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/bin/quakemap.cfg
-		${OGRE_TESTCONTEXT_CONTENTS_PATH}/Resources/
 		COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/bin/tests.cfg
 		${OGRE_TESTCONTEXT_CONTENTS_PATH}/Resources/
 		COMMAND ln ARGS -s -f ${OGRE_SOURCE_DIR}/Samples/Media
--- a/Tests/VisualTests/PlayPen/src/PlayPenTests.cpp	1989-12-31 19:00:00.000000000 -0500
+++ b/Tests/VisualTests/PlayPen/src/PlayPenTests.cpp	2018-01-17 14:44:24.663452014 -0500
@@ -2078,47 +2078,6 @@
     addScreenshotFrame(10);
 }
 //----------------------------------------------------------------------------
-
-void PlayPen_Bsp::setupContent()
-{
-    // Load Quake3 locations from a file
-    ConfigFile cf;
-
-    cf.load(mFSLayer->getConfigFilePath("quakemap.cfg"));
-
-    String quakePk3 = cf.getSetting("Archive");
-    String quakeLevel = cf.getSetting("Map");
-
-    //ResourceGroupManager::getSingleton().addResourceLocation(quakePk3, "Zip");
-
-    ResourceGroupManager::getSingleton().addResourceLocation(
-        quakePk3, "Zip",
-        ResourceGroupManager::getSingleton().getWorldResourceGroupName(), true);
-
-    // Load world geometry
-    //mSceneMgr->setWorldGeometry(quakeLevel);
-
-    ResourceGroupManager& rgm = ResourceGroupManager::getSingleton();
-    rgm.linkWorldGeometryToResourceGroup(rgm.getWorldResourceGroupName(), quakeLevel, mSceneMgr);
-    rgm.initialiseResourceGroup(rgm.getWorldResourceGroupName());
-    rgm.loadResourceGroup(rgm.getWorldResourceGroupName(), false);
-
-    // modify camera for close work
-    mCamera->setNearClipDistance(4);
-    mCamera->setFarClipDistance(4000);
-
-    // Also change position, and set Quake-type orientation
-    // Get random player start point
-    ViewPoint vp = mSceneMgr->getSuggestedViewpoint(true);
-    mCameraNode->setPosition(vp.position);
-    mCameraNode->pitch(Degree(90)); // Quake uses X/Y horizon, Z up
-    mCameraNode->rotate(vp.orientation);
-    // Don't yaw along variable axis, causes leaning
-    mCameraNode->setFixedYawAxis(true, Vector3::UNIT_Z);
-
-    mCameraNode->yaw(Ogre::Degree(-90.f));
-}
-//----------------------------------------------------------------------------
 //----------------------------------------------------------------------------
 
 PlayPen_BuildTangentOnAnimatedMesh::PlayPen_BuildTangentOnAnimatedMesh()
