diff --git a/Code/Misc/EventHandler/EventButton.cpp b/Code/Misc/EventHandler/EventButton.cpp
deleted file mode 100644
index e69de29b..00000000
diff --git a/Code/Misc/EventHandler/EventButton.h b/Code/Misc/EventHandler/EventButton.h
deleted file mode 100644
index e69de29b..00000000
diff --git a/Code/Misc/EventHandler/EventButtonCollection.cpp b/Code/Misc/EventHandler/EventButtonCollection.cpp
deleted file mode 100644
index b3d37bfe..00000000
--- a/Code/Misc/EventHandler/EventButtonCollection.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-#include "EventButtonCollection.h"
-
-using namespace Oyster::Event;
-
-EventButtonCollection::EventButtonCollection()
-{
-
-}
-
-EventButtonCollection::~EventButtonCollection()
-{
-}
-
-void EventButtonCollection::Update(InputClass* inputObject)
-{
-	for(int i = 0; i < buttons.size(); i++)
-	{
-		buttons.at(i)->Update(inputObject);
-	}
-}
-
-EventButton* EventButtonCollection::AddButton(EventButton* button)
-{
-
-}
\ No newline at end of file
diff --git a/Code/Misc/EventHandler/EventButtonCollection.h b/Code/Misc/EventHandler/EventButtonCollection.h
deleted file mode 100644
index 31201f9c..00000000
--- a/Code/Misc/EventHandler/EventButtonCollection.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#ifndef EVENT_BUTTON_COLLECTION_H
-#define EVENT_BUTTON_COLLECTION_H
-
-#include "../../Input/L_inputClass.h"
-
-#include "EventButton.h"
-
-#include <vector>
-
-namespace Oyster
-{
-	namespace Event
-	{
-		class EventButtonCollection
-		{
-		public:
-			EventButtonCollection();
-			~EventButtonCollection();
-
-			void Update(InputClass* inputObject);
-
-			EventButton* AddButton(EventButton* button);
-
-		private:
-			std::vector<EventButton*> buttons;
-
-		};
-	}
-}
-
-#endif
\ No newline at end of file
diff --git a/Code/Misc/EventHandler/EventHandler.cpp b/Code/Misc/EventHandler/EventHandler.cpp
deleted file mode 100644
index 8f6705df..00000000
--- a/Code/Misc/EventHandler/EventHandler.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-#include "EventHandler.h"
-
-using namespace Oyster::Event;
-
-EventHandler EvtHandler;
-
-EventHandler& EventHandler::Instance()
-{
-	return EvtHandler;
-}
-
-EventHandler::EventHandler()
-{
-
-}
-
-EventHandler::~EventHandler()
-{
-}
-
-void EventHandler::Update(InputClass* inputObject)
-{
-	for(int i = 0; i < collections.size(); i++)
-	{
-		collections.at(i)->Update(inputObject);
-	}
-}
-
-EventButtonCollection* EventHandler::CreateCollection()
-{
-
-}
-
-EventButtonCollection* EventHandler::GetCollection(/*ID*/);
-{
-
-}
\ No newline at end of file
diff --git a/Code/Misc/EventHandler/EventHandler.h b/Code/Misc/EventHandler/EventHandler.h
deleted file mode 100644
index c3ecc0a2..00000000
--- a/Code/Misc/EventHandler/EventHandler.h
+++ /dev/null
@@ -1,35 +0,0 @@
-#ifndef EVENT_HANDLER_H
-#define EVENT_HANDLER_H
-
-#include "../../Input/L_inputClass.h"
-
-#include "EventButtonCollection.h"
-#include "EventButton.h"
-
-#include <vector>
-
-namespace Oyster
-{
-	namespace Event
-	{
-		class EventHandler
-		{
-			EventHandler();
-			~EventHandler();
-
-			EventHandler& Instance();
-
-			void Update(InputClass* inputObject);
-
-			EventButtonCollection* CreateCollection();
-			EventButtonCollection* GetCollection(/*ID*/);
-
-
-		private:
-			std::vector<EventButtonCollection*> collections;
-
-		};
-	}
-}
-
-#endif
\ No newline at end of file