Index: code/branches/gui/src/orxonox/Main.cc
===================================================================
--- code/branches/gui/src/orxonox/Main.cc	(revision 1688)
+++ code/branches/gui/src/orxonox/Main.cc	(revision 1689)
@@ -48,5 +48,4 @@
 #include "gamestates/GSClient.h"
 #include "gamestates/GSGUI.h"
-#include "gamestates/GSIO.h"
 #include "gamestates/GSIOConsole.h"
 
@@ -90,38 +89,4 @@
     SignalHandler::getInstance()->doCatch(argv[0], "orxonox.log");
 
-
-    /*GameState* state1 = new GameState("state1");
-    GameState* state2 = new GameState("state2");
-    GameState* state3 = new GameState("state3");
-    GameState* state4 = new GameState("state4");
-    GameState* state5 = new GameState("state5");
-    GameState* state6 = new GameState("state6");
-
-    state1->addChild(state4);
-    state1->addChild(state6);
-    state2->addChild(state3);
-    state2->addChild(state5);
-    state6->addChild(state2);
-
-    state6->removeChild("state2");
-
-    state5->requestState("state3");
-    COUT(2) << std::endl;
-    state2->requestState("state2");
-    COUT(2) << std::endl;
-    state2->requestState("state1");
-    COUT(2) << std::endl;
-    state4->requestState("state3");
-    COUT(2) << std::endl;
-    state1->requestState("state4");
-    COUT(2) << std::endl;
-    state1->requestState("state2");
-    COUT(2) << std::endl;
-    state1->requestState("stat");
-    COUT(2) << std::endl;
-    state1->requestState("state5");
-    COUT(2) << std::endl;*/
-
-
     GSRoot root;
     GSGraphics graphics;
@@ -140,6 +105,5 @@
     root.addChild(&ioConsole);
 
-    root.feedCommandLine(argc, argv);
-    root.start();
+    root.start(argc, argv);
 
     return 0;
Index: code/branches/gui/src/orxonox/gamestates/GSGUI.cc
===================================================================
--- code/branches/gui/src/orxonox/gamestates/GSGUI.cc	(revision 1688)
+++ code/branches/gui/src/orxonox/gamestates/GSGUI.cc	(revision 1689)
@@ -39,5 +39,5 @@
 {
     GSGUI::GSGUI()
-        : GameStateTyped<GSGraphics>("gui")
+        : GameState<GSGraphics>("gui")
     {
     }
Index: code/branches/gui/src/orxonox/gamestates/GSGUI.h
===================================================================
--- code/branches/gui/src/orxonox/gamestates/GSGUI.h	(revision 1688)
+++ code/branches/gui/src/orxonox/gamestates/GSGUI.h	(revision 1689)
@@ -36,5 +36,5 @@
 namespace orxonox
 {
-    class _OrxonoxExport GSGUI : public GameStateTyped<GSGraphics>
+    class _OrxonoxExport GSGUI : public GameState<GSGraphics>
     {
     public:
Index: code/branches/gui/src/orxonox/gamestates/GSGraphics.cc
===================================================================
--- code/branches/gui/src/orxonox/gamestates/GSGraphics.cc	(revision 1688)
+++ code/branches/gui/src/orxonox/gamestates/GSGraphics.cc	(revision 1689)
@@ -57,5 +57,5 @@
 {
     GSGraphics::GSGraphics()
-        : GameStateTyped<GSRoot>("graphics")
+        : GameState<GSRoot>("graphics")
         , ogreRoot_(0)
         , inputManager_(0)
Index: code/branches/gui/src/orxonox/gamestates/GSGraphics.h
===================================================================
--- code/branches/gui/src/orxonox/gamestates/GSGraphics.h	(revision 1688)
+++ code/branches/gui/src/orxonox/gamestates/GSGraphics.h	(revision 1689)
@@ -39,5 +39,5 @@
 namespace orxonox
 {
-    class _OrxonoxExport GSGraphics : public GameStateTyped<GSRoot>, public OrxonoxClass, public Ogre::WindowEventListener
+    class _OrxonoxExport GSGraphics : public GameState<GSRoot>, public OrxonoxClass, public Ogre::WindowEventListener
     {
         friend class ClassIdentifier<GSGraphics>;
Index: code/branches/gui/src/orxonox/gamestates/GSIOConsole.cc
===================================================================
--- code/branches/gui/src/orxonox/gamestates/GSIOConsole.cc	(revision 1688)
+++ code/branches/gui/src/orxonox/gamestates/GSIOConsole.cc	(revision 1689)
@@ -42,5 +42,5 @@
 {
     GSIOConsole::GSIOConsole()
-        : GameStateTyped<GSRoot>("ioConsole")
+        : GameState<GSRoot>("ioConsole")
     {
     }
Index: code/branches/gui/src/orxonox/gamestates/GSIOConsole.h
===================================================================
--- code/branches/gui/src/orxonox/gamestates/GSIOConsole.h	(revision 1688)
+++ code/branches/gui/src/orxonox/gamestates/GSIOConsole.h	(revision 1689)
@@ -37,5 +37,5 @@
 namespace orxonox
 {
-    class _OrxonoxExport GSIOConsole : public GameStateTyped<GSRoot>
+    class _OrxonoxExport GSIOConsole : public GameState<GSRoot>
     {
     public:
Index: code/branches/gui/src/orxonox/gamestates/GSLevel.cc
===================================================================
--- code/branches/gui/src/orxonox/gamestates/GSLevel.cc	(revision 1688)
+++ code/branches/gui/src/orxonox/gamestates/GSLevel.cc	(revision 1689)
@@ -45,5 +45,5 @@
 {
     GSLevel::GSLevel(const std::string& name)
-        : GameStateTyped<GSGraphics>(name)
+        : GameState<GSGraphics>(name)
         , timeFactor_(1.0f)
         , sceneManager_(0)
Index: code/branches/gui/src/orxonox/gamestates/GSLevel.h
===================================================================
--- code/branches/gui/src/orxonox/gamestates/GSLevel.h	(revision 1688)
+++ code/branches/gui/src/orxonox/gamestates/GSLevel.h	(revision 1689)
@@ -37,5 +37,5 @@
 namespace orxonox
 {
-    class _OrxonoxExport GSLevel : public GameStateTyped<GSGraphics>
+    class _OrxonoxExport GSLevel : public GameState<GSGraphics>
     {
     public:
Index: code/branches/gui/src/orxonox/gamestates/GSRoot.cc
===================================================================
--- code/branches/gui/src/orxonox/gamestates/GSRoot.cc	(revision 1688)
+++ code/branches/gui/src/orxonox/gamestates/GSRoot.cc	(revision 1689)
@@ -91,31 +91,4 @@
     }
 
-    //SetCommandLineArgument(asdf1, "haha").setShortcut("a").setUsageInformation("1|2|3");
-    //SetCommandLineArgument(asdf2, 3).setShortcut("b");
-    //SetCommandLineArgument(asdf3, Vector2()).setShortcut("c");
-    //SetCommandLineArgument(adsf4, 1.4f).setShortcut("d");
-    //SetCommandLineSwitch(showGraphics).setShortcut("g");
-
-    void GSRoot::feedCommandLine(int argc, char** argv)
-    {
-        std::vector<std::string> args;
-        for (int i = 1; i < argc; ++i)
-            args.push_back(argv[i]);
-
-        //std::string line = "-a --asdf3 (3,3) -d -5 -b - 5.4";
-        //SubString tokens(line, " ", " ", false, 92, false, 34, true, 40, 41, false, 0);
-
-        try
-        {
-            orxonox::CommandLine::parse(args);
-            //CommandLine::parse(tokens.getAllStrings());
-        }
-        catch (orxonox::ArgumentException& ex)
-        {
-            COUT(1) << ex.what() << std::endl;
-            COUT(0) << "Usage:" << std::endl << "orxonox " << CommandLine::getUsageInformation() << std::endl;
-        }
-    }
-
     void GSRoot::enter()
     {
@@ -165,5 +138,5 @@
 
         // add console commands
-        FunctorMember01<GameState, const std::string&>* functor2 = createFunctor(&GameState::requestState);
+        FunctorMember01<GameStateBase, const std::string&>* functor2 = createFunctor(&GameStateBase::requestState);
         functor2->setObject(this);
         CommandExecutor::addConsoleCommandShortcut(createConsoleCommand(functor2, "selectGameState"));
Index: code/branches/gui/src/orxonox/gamestates/GSRoot.h
===================================================================
--- code/branches/gui/src/orxonox/gamestates/GSRoot.h	(revision 1688)
+++ code/branches/gui/src/orxonox/gamestates/GSRoot.h	(revision 1689)
@@ -44,6 +44,4 @@
         ~GSRoot();
 
-        void feedCommandLine(int argc, char** argv);
-
         void exitGame()
         { requestState("root"); }
