diff --git a/Build Instructions.txt b/Build Instructions.txt
deleted file mode 100644
index 1388006..0000000
--- a/Build Instructions.txt	
+++ /dev/null
@@ -1,99 +0,0 @@
-Linux Setup (x86 ubuntu)
-===============================
-Install ubuntu or xubuntu 14.04 (or newer)
-0. Run the following command to install necessary dependencies
-	sudo apt-get install tortoisehg g++ cmake dos2unix zlib1g-dev libsdl2-2.0 libsdl2-mixer-2.0 libsdl2-image-2.0 libsdl2-ttf-2.0 \
-                libsdl2-dev libsdl2-mixer-dev libsdl2-image-dev libsdl2-ttf-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev \
-                libgstreamer-plugins-good1.0-dev zlib1g-dev libglib2.0-0 libglib2.0-dev sqlite3
-
-1. Obtain the source code by running the following command:
-   hg clone https://bitbucket.org/teamretro/retrofe
-   
-2. Generate your gcc make files with running the following command from inside the root folder of your setup:
-
-  cmake RetroFE/Source -BRetroFE/Build -DVERSION_MAJOR=0 -DVERSION_MINOR=0 -DVERSION_BUILD=0
-
-3. Compile RetroFE and create a full environment by running the following commands: 
-
-  cmake --build RetroFE/Build
-  python Scripts/Package.py --os=linux --build=full
-
-4. Copy your live RetroFE system to any folder of your choosing. files can be found in Artifacts\linux\RetroFE
-
-Linux Setup (Raspberry Pi running ubuntu)
-===============================
-Install raspbian
-0. Run the following command to install necessary dependencies
-	sudo apt-get install tortoisehg g++ cmake dos2unix
-
-1. Obtain the source code by running the following command:
-   hg clone https://bitbucket.org/teamretro/retrofe
-
-2. Compile SDL2 by running the following command:
-   sudo Scripts/Raspi/install_sdl2_rpi.sh
-   
-3. Generate your gcc make files with running the following command from inside the root folder of your setup:
-
-  cmake RetroFE/Source -BRetroFE/Build -DVERSION_MAJOR=0 -DVERSION_MINOR=0 -DVERSION_BUILD=0
-
-4. Compile RetroFE and create a full environment by running the following commands: 
-
-  cmake --build RetroFE/Build
-  python Scripts/Package.py --os=linux --build=full
-
-5. Copy your live RetroFE system to any folder of your choosing. files can be found in Artifacts\linux\RetroFE
-
-Windows Setup
-===============================
-0. Setup libraries
-  Install Python 2.7
-  Install sphinx with python
-  Install visual studio 2012
-  Install Microsoft Windows SDK for Windows 7 and .net Framework 4 http://www.microsoft.com/en-us/download/details.aspx?id=8279
-  Install cmake
-  Install tortoisehg
-  Install 7zip
-  Install gstreamer and gstreamer-devel to c:/gstreamer(x86, not 64 bit!) from http://gstreamer.freedesktop/org/data/pkg/windows/1.4.0
-
-1. Obtain the source code by running the following command:
-   hg clone https://bitbucket.org/teamretro/retrofe
-
-2. Setup Environment
- 
-   Run "RetroFE/Source/SetupEnvironment.bat" to setup necessary variables and paths to compile in visual studio
-
-3. Generate your visual studio solution files with running the following command from inside the root folder of your setup:
-
-  cmake RetroFE/Source -BRetroFE/Build -DGSTREAMER_ROOT=C:/gstreamer/1.0/x86 -DVERSION_MAJOR=0 -DVERSION_MINOR=0 -DVERSION_BUILD=0
-  
-4. Compile RetroFE and create a full environment by running the following commands: 
-
-  cmake --build RetroFE/Build --config Release
-  python Scripts\Package.py --os=windows --build=full --gstreamer_path=D:/gstreamer/1.0/x86
-
-5. Copy your live RetroFE system to any folder of your choosing. files can be found in Artifacts\windows\RetroFE
-
-
-Other build options
-===============================
-After compiling your code you can also build different environments:
-
-1. To copy just the layouts to Artifacts/windows/RetroFE, run 
-  python Scripts\Package.py --os=windows --build=layout --gstreamer_path=D:/gstreamer/1.0/x86
-  or
-  python Scripts\Package.py --os=linux --build=layout
-  
-2. To copy just retrofe.exe to Artifacts/windows/RetroFE, run 
-  python Scripts\Package.py --os=windows --build=engine --gstreamer_path=D:/gstreamer/1.0/x86
-  or
-  python Scripts\Package.py --os=linux --build=engine
-
-3. To copy just the third party dlls and retrofe to Artifacts/windows/RetroFE, run 
-  python Scripts\Package.py --os=windows --build=core --gstreamer_path=D:/gstreamer/1.0/x86
-  or
-  python Scripts\Package.py --os=linux --build=core
-
-4. To copy a whole live installation Artifacts/windows/RetroFE, run 
-  python Scripts\Package.py --os=windows --build=full --gstreamer_path=D:/gstreamer/1.0/x86
-  or
-  python Scripts\Package.py --os=linux --build=full
diff --git a/RetroFE/Source/Database/Configuration.cpp b/RetroFE/Source/Database/Configuration.cpp
index b6e9274..ca0fbef 100644
--- a/RetroFE/Source/Database/Configuration.cpp
+++ b/RetroFE/Source/Database/Configuration.cpp
@@ -41,8 +41,6 @@ Configuration::~Configuration()
 
 void Configuration::Initialize()
 {
-        Configuration::SetAbsolutePath("D:\\RetroFE");
-        return;
     const char *environment = std::getenv("RETROFE_PATH");
     std::string environmentStr;
     if (environment != NULL)