diff --git a/binding-mri/module_rpg1.rb b/binding-mri/module_rpg1.rb
index aab6d20..f2c4ad5 100644
--- a/binding-mri/module_rpg1.rb
+++ b/binding-mri/module_rpg1.rb
@@ -1415,7 +1415,6 @@ module RPG
       @cancel_se = RPG::AudioFile.new("", 80)
       @buzzer_se = RPG::AudioFile.new("", 80)
       @equip_se = RPG::AudioFile.new("", 80)
-      @shop_se = RPG::AudioFile.new("", 80)
       @save_se = RPG::AudioFile.new("", 80)
       @load_se = RPG::AudioFile.new("", 80)
       @battle_start_se = RPG::AudioFile.new("", 80)
@@ -1451,7 +1450,6 @@ module RPG
     attr_accessor :cancel_se
     attr_accessor :buzzer_se
     attr_accessor :equip_se
-    attr_accessor :shop_se
     attr_accessor :save_se
     attr_accessor :load_se
     attr_accessor :battle_start_se
diff --git a/scripts/Game_Temp.rb b/scripts/Game_Temp.rb
index b08c334..bfca7f6 100644
--- a/scripts/Game_Temp.rb
+++ b/scripts/Game_Temp.rb
@@ -39,14 +39,12 @@ class Game_Temp
   attr_accessor :battle_main_phase        # battle flag: main phase
   attr_accessor :battleback_name          # battleback file name
   attr_accessor :forcing_battler          # battler being forced into action
-  attr_accessor :shop_calling             # shop calling flag
-  attr_accessor :shop_goods               # list of shop goods
   attr_accessor :name_calling             # name input: calling flag
   attr_accessor :menu_calling             # menu calling flag
   attr_accessor :item_menu_calling        # item menu calling flag
   attr_accessor :travel_menu_calling      # fast travel menu calling flag
   attr_accessor :window_settings_calling  # fast travel menu calling flag
-  attr_accessor :window_debug_calling  # fast travel menu calling flag
+  attr_accessor :window_debug_calling     # debug menu calling flag
   attr_accessor :menu_beep                # menu: play sound effect flag
   attr_accessor :save_calling             # save calling flag
   attr_accessor :debug_calling            # debug calling flag
@@ -98,8 +96,6 @@ class Game_Temp
     @battle_main_phase = false
     @battleback_name = ''
     @forcing_battler = nil
-    @shop_calling = false
-    @shop_id = 0
     @name_calling = false
     @name_actor_id = 0
     @name_max_char = 0
diff --git a/scripts/Interpreter_2.rb b/scripts/Interpreter_2.rb
index c065fd9..b36222c 100644
--- a/scripts/Interpreter_2.rb
+++ b/scripts/Interpreter_2.rb
@@ -155,8 +155,6 @@ class Interpreter
       return command_602
     when 603  # If Lose
       return command_603
-    when 302  # Shop Processing
-      return command_302
     when 303  # Name Input Processing
       return command_303
     when 311  # Change HP
diff --git a/scripts/Interpreter_6.rb b/scripts/Interpreter_6.rb
index 808ba26..3afb769 100644
--- a/scripts/Interpreter_6.rb
+++ b/scripts/Interpreter_6.rb
@@ -71,31 +71,6 @@ class Interpreter
     return command_skip
   end
   #--------------------------------------------------------------------------
-  # * Shop Processing
-  #--------------------------------------------------------------------------
-  def command_302
-    # Set battle abort flag
-    $game_temp.battle_abort = true
-    # Set shop calling flag
-    $game_temp.shop_calling = true
-    # Set goods list on new item
-    $game_temp.shop_goods = [@parameters]
-    # Loop
-    while true
-      # Advance index
-      @index += 1
-      # If next event command has shop on second line or after
-      if @list[@index].code == 605
-        # Add goods list to new item
-        $game_temp.shop_goods.push(@list[@index].parameters)
-      # If event command does not have shop on second line or after
-      else
-        # End
-        return false
-      end
-    end
-  end
-  #--------------------------------------------------------------------------
   # * Name Input Processing
   #--------------------------------------------------------------------------
   def command_303
diff --git a/scripts/Scene_Map.rb b/scripts/Scene_Map.rb
index 6d3d45e..c4e6f9b 100644
--- a/scripts/Scene_Map.rb
+++ b/scripts/Scene_Map.rb
@@ -360,17 +360,6 @@ class Scene_Map
     $scene = Scene_Battle.new
   end
   #--------------------------------------------------------------------------
-  # * Shop Call
-  #--------------------------------------------------------------------------
-  def call_shop
-    # Clear shop call flag
-    $game_temp.shop_calling = false
-    # Straighten player position
-    $game_player.straighten
-    # Switch to shop screen
-    $scene = Scene_Shop.new
-  end
-  #--------------------------------------------------------------------------
   # * Name Input Call
   #--------------------------------------------------------------------------
   def call_name
diff --git a/scripts/Window_MainMenu.rb b/scripts/Window_MainMenu.rb
index 2dea75e..a169780 100644
--- a/scripts/Window_MainMenu.rb
+++ b/scripts/Window_MainMenu.rb
@@ -2,8 +2,6 @@
 class Window_MainMenu < Window_Selectable
   def initialize
     super(Graphics.width / 2 - 304, 16, 608, 64)
-    #kostil' ebanyy
-    @debug_menu = ::Window_TPtL.new
 
     # Set up menu options
     @commands = Array.new
diff --git a/scripts/Window_TPtL.rb b/scripts/Window_TPtL.rb
index b2842fc..fbcdc11 100644
--- a/scripts/Window_TPtL.rb
+++ b/scripts/Window_TPtL.rb
@@ -5,7 +5,7 @@ class Window_TPtL < Window_Selectable
     @mapinfo = load_data("Data/MapInfos.rxdata")
 		
     @item_max = 262
-    @column_max = Graphics.width > 600 ? 4 : 2
+    @column_max = Graphics.width > 600 ? 6 : 2
 
     # Make invisible by default
     self.visible = false