diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1f4a215413..ad2529a351 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -141,7 +141,6 @@ set(DEFAULT_NACL_VM_INHERITED_OPTIONS
     BUILD_CGAME
     BUILD_SGAME
     CMAKE_BUILD_TYPE
-    DAEMON_CBSE_PYTHON_PATH
     USE_ARCH_INTRINSICS
     USE_COMPILER_CUSTOMIZATION
     USE_COMPILER_INTRINSICS
diff --git a/cmake/DaemonCBSE.cmake b/cmake/DaemonCBSE.cmake
deleted file mode 100644
index 63019ace38..0000000000
--- a/cmake/DaemonCBSE.cmake
+++ /dev/null
@@ -1,81 +0,0 @@
-# Daemon BSD Source Code
-# Copyright (c) 2013-2016, Daemon Developers
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#  * Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#  * Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-#  * Neither the name of the Daemon developers nor the
-#    names of its contributors may be used to endorse or promote products
-#    derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL DAEMON DEVELOPERS BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# Allow overriding the python path with a cached variable.
-set(DAEMON_CBSE_PYTHON_PATH "NOTFOUND" CACHE FILEPATH "Python executable for CBSE code generation")
-if (NOT DAEMON_CBSE_PYTHON_PATH OR NOT EXISTS ${DAEMON_CBSE_PYTHON_PATH})
-    find_package(Python REQUIRED)
-    set(DAEMON_CBSE_PYTHON_PATH "${Python_EXECUTABLE}" CACHE FILEPATH "Python executable for CBSE code generation" FORCE)
-endif()
-message(STATUS "Using CBSE Python executable: ${DAEMON_CBSE_PYTHON_PATH}")
-
-function(maybe_add_dep target dep)
-    if (TARGET ${target})
-        add_dependencies(${target} ${dep})
-    endif()
-endfunction()
-
-function(CBSE target definition output)
-    # Check if python has all the dependencies
-    # TODO: Execute pip directly here and install them
-    execute_process(
-        COMMAND ${DAEMON_CBSE_PYTHON_PATH} -c "import jinja2, yaml, collections, argparse, sys, os.path, re"
-        RESULT_VARIABLE RET)
-    if (NOT RET EQUAL 0)
-        message(FATAL_ERROR "Missing dependences for CBSE generation. Please ensure you have python with python-yaml and python-jinja installed.
-                             Use pip install -r src/utils/cbse/requirements.txt to install")
-    endif()
-    set(GENERATED_CBSE ${output}/backend/CBSEBackend.cpp
-                       ${output}/backend/CBSEBackend.h
-                       ${output}/backend/CBSEComponents.h
-                       ${output}/backend/CBSEEntities.h)
-    add_custom_command(
-        OUTPUT ${GENERATED_CBSE}
-        COMMENT "Generating CBSE entities for ${definition}"
-        DEPENDS ${definition}
-                ${CMAKE_SOURCE_DIR}/src/utils/cbse/CBSE.py
-                ${CMAKE_SOURCE_DIR}/src/utils/cbse/templates/Backend.cpp
-                ${CMAKE_SOURCE_DIR}/src/utils/cbse/templates/Backend.h
-                ${CMAKE_SOURCE_DIR}/src/utils/cbse/templates/Component.cpp
-                ${CMAKE_SOURCE_DIR}/src/utils/cbse/templates/Component.h
-                ${CMAKE_SOURCE_DIR}/src/utils/cbse/templates/Components.h
-                ${CMAKE_SOURCE_DIR}/src/utils/cbse/templates/Entities.h
-                ${CMAKE_SOURCE_DIR}/src/utils/cbse/templates/Helper.h
-        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/utils/cbse
-        COMMAND
-                ${DAEMON_CBSE_PYTHON_PATH}
-                ${CMAKE_SOURCE_DIR}/src/utils/cbse/CBSE.py
-                -s -o
-                "${output}"
-                "${definition}"
-    )
-    string(REPLACE ${CMAKE_SOURCE_DIR}/ "" rel_path ${definition})
-    string(REPLACE "/" "-" new_target ${rel_path})
-    add_custom_target(${new_target} ALL
-        DEPENDS ${GENERATED_CBSE}
-    )
-    set(${target}_GENERATED_CBSE ${GENERATED_CBSE} PARENT_SCOPE)
-endfunction()
diff --git a/cmake/DaemonGame.cmake b/cmake/DaemonGame.cmake
index f6adde3c7c..7aa6f43b51 100644
--- a/cmake/DaemonGame.cmake
+++ b/cmake/DaemonGame.cmake
@@ -197,8 +197,8 @@ function(GAMEMODULE)
 
 		set(INHERITED_OPTION_ARGS)
 
-		foreach(inherited_option ${NACL_VM_INHERITED_OPTIONS})
-			set(INHERITED_OPTION_ARGS ${INHERITED_OPTION_ARGS}
+		foreach(inherited_option IN LISTS NACL_VM_INHERITED_OPTIONS GAME_NACL_VM_INHERITED_OPTIONS)
+			list(APPEND INHERITED_OPTION_ARGS
 				"-D${inherited_option}=${${inherited_option}}")
 		endforeach(inherited_option)