diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 1bf496c0..00000000
--- a/.gitignore
+++ /dev/null
@@ -1,30 +0,0 @@
-help.db
-mushclient_prefs.sqlite
-*.swp
-*.mushz
-*-state*
-MUSHclient.GID
-jfwlib.exe
-version.txt
-MUSHclient.ini
-aa-md5.ini
-friends.txt
-*/alteraeon/maps/*
-crap
-diffs
-temp
-*.old
-*.log
-mushz/help.db
-spam.txt
-src
-build_src.sh
-*.tmp
-
-mushz/worlds/plugins/gstats.xml
-mushz/lua/mushz_xera.lua
-mushz/scripts/move.txt
-mushz/worlds/alteraeon/sounds/vocal
-wiki/*.txt
-mushz/lua/mushz/dev
-mushz/lua/mushz/config/autogen_aa_help.lua
diff --git a/innosetup/mush-huge.iss b/innosetup/mush-huge.iss
index 75ba2cd7..7141c184 100644
--- a/innosetup/mush-huge.iss
+++ b/innosetup/mush-huge.iss
@@ -41,13 +41,13 @@ Source: "..\mushz\*"; DestDir: "{app}"; Excludes: "worlds\alteraeon\settings\*";
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
 [Icons]
-Name: {group}\Check for updates; Filename: {app}\update.exe
+Name: {group}\Launch Mush-Z; Filename: {app}\mushz_launcher.exe
 Name: {group}\Explore game sounds; filename: {app}\worlds\alteraeon\sounds\
 Name: {group}\{#MyAppName}; WorkingDir: "{app}"; Filename: {app}\{#MyAppExeName}
 
 Name: {group}\Readme; Filename: {app}\readme.html
 Name: {group}\Recent changes; Filename: {app}\changelog.txt
-Name: {group}\Update to beta version; Filename: {app}\update_beta.exe
+Name: {group}\Launch beta version; Filename: {app}\mushz_launcher_beta.exe
 Name: {group}\Visit the alter aeon website; Filename: http://www.alteraeon.com
 Name: {group}\Visit the Mush-Z website; Filename: http://www.mush-z.com
 
@@ -60,7 +60,7 @@ Root: HKCR; Subkey: ".mcl"; ValueType: string; ValueName: ""; ValueData: "mush-z
 Root: HKCR; Subkey: " mush-z file"; ValueType: string; ValueName: ""; ValueData: "mush-z file"; Flags: uninsdeletekey
 
 Root: HKCR; Subkey: " mush-z file\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\MUSHClient.exe,0"
-Root: HKCR; Subkey: " mush-z\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\MUSHClient.exe"" ""%1"""
+Root: HKCR; Subkey: " mush-z\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\mushz_launcher.exe"" ""%1"""
 
 [Run]
 Filename: {app}\jfwlib.exe;
diff --git a/mushz/.gitignore b/mushz/.gitignore
deleted file mode 100644
index ad60afdf..00000000
--- a/mushz/.gitignore
+++ /dev/null
@@ -1,16 +0,0 @@
-# files
-help.db
-alter_aeon.mcl
-**.mcl
-*.mcl
-*.sqlite
-
-# directories
-spell
-logs
-help
-
-# worlds
-worlds/alteraeon/test.lua
-worlds/new.lua
-worlds/mushz_core.lua