diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
index a488bdf..d3db972 100644
--- a/scripts/CMakeLists.txt
+++ b/scripts/CMakeLists.txt
@@ -4,8 +4,6 @@ set(scripts
   Data_Footsteps.rb
   Data_Item.rb
   Data_SpecialEventData.rb
-  Data_TileText.rb
-  Demo.rb
   Desktop_Message.rb
   Doc_Message.rb
   EdText.rb
diff --git a/scripts/Data_TileText.rb b/scripts/Data_TileText.rb
deleted file mode 100644
index e69de29..0000000
diff --git a/scripts/Demo.rb b/scripts/Demo.rb
deleted file mode 100644
index ba06652..0000000
--- a/scripts/Demo.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-def demo_entity_message
-  Oneshot.msgbox Oneshot::Msg::INFO, "[...Who am I kidding. Of course I don't.]"
-  Oneshot.msgbox Oneshot::Msg::ERR, "[If you DO decide to visit this world again, #{$game_oneshot.player_name}... I won't be looking forward to it at all.]"
-  Oneshot.msgbox Oneshot::Msg::ERR, "[I'm so tired.]"
-  Oneshot.msgbox Oneshot::Msg::ERR, "[Goodbye.]"
-  Graphics.frame_reset
-end
diff --git a/scripts/Game_Oneshot.rb b/scripts/Game_Oneshot.rb
index 3d75765..b2a5478 100644
--- a/scripts/Game_Oneshot.rb
+++ b/scripts/Game_Oneshot.rb
@@ -9,11 +9,7 @@ class Game_Oneshot
   attr_accessor :wallpaper_color          # the wallpaper color
 
   def initialize
-    if $GDC
-      @player_name = ''
-    else
-      @player_name = Game_Oneshot.get_user_name.force_encoding("utf-8")
-    end
+    @player_name = Game_Oneshot.get_user_name.force_encoding("utf-8")
     @lights = {}
     @plight_timer = nil
     @wallpaper = nil
diff --git a/scripts/Main.rb b/scripts/Main.rb
index 1efbc73..295eeeb 100644
--- a/scripts/Main.rb
+++ b/scripts/Main.rb
@@ -19,16 +19,11 @@ begin
 
   # Prepare for transition
   Graphics.freeze
-  $demo = false
-  $GDC = false
   # Make scene object (title screen)
   $scene = Scene_Title.new
   Oneshot.allow_exit false
   Oneshot.exiting false
 
-#  x = Oneshot.textinput("Foo Bar")
-#  print("#{x}")
-
   # Call main method as long as $scene is effective
   while $scene != nil
     $scene.main
diff --git a/scripts/Scene_Title.rb b/scripts/Scene_Title.rb
index 6ec959f..51ae196 100644
--- a/scripts/Scene_Title.rb
+++ b/scripts/Scene_Title.rb
@@ -33,13 +33,6 @@ class Scene_Title
     # Make system object
     $game_system = Game_System.new
 
-    # Skip title screen if debug mode (or demo, but not GDC)
-    #if $debug || ($demo && !$GDC) || save_exists
-    #  $game_map.update
-    #  $game_map.autoplay
-    #  $scene = Scene_Map.new
-    #  return
-    #end
     load_perma_flags
 	Window_Settings.load_settings
     Oneshot.allow_exit true
diff --git a/scripts/_scripts.txt b/scripts/_scripts.txt
index f92148a..fa66154 100644
--- a/scripts/_scripts.txt
+++ b/scripts/_scripts.txt
@@ -127,7 +127,6 @@ Desktop_Message
 Credits_Message
 Particles
 
-Demo
 EdText
 
 Main