diff --git a/engine.build.lua b/engine.build.lua
index 85adcc3..c4a7b84 100644
--- a/engine.build.lua
+++ b/engine.build.lua
@@ -56,8 +56,6 @@ local platform_spec_module = Module("source/Platform/Win32", {
 
 local input_module = Module("source/Input", {
 	"InputDevice.cpp",
-	"InputEvent.cpp",
-	"InputListener.cpp",
 	"InputModule.cpp",
 	"Keyboard.cpp",
 	"Mouse.cpp"
diff --git a/include/Spectre/Game.h b/include/Spectre/Game.h
index 4036bf6..9279c69 100644
--- a/include/Spectre/Game.h
+++ b/include/Spectre/Game.h
@@ -3,7 +3,6 @@
 #define SPECTRE_GAME_H
 
 #include <Spectre/Graphics.h>
-#include <Spectre/Input/InputEvent.h>
 #include <Spectre/Game/FPSCounter.h>
 
 class InputModule;
diff --git a/include/Spectre/Input/InputEvent.h b/include/Spectre/Input/InputEvent.h
deleted file mode 100644
index 947e38c..0000000
--- a/include/Spectre/Input/InputEvent.h
+++ /dev/null
@@ -1,54 +0,0 @@
-
-#ifndef SPECTRE_INPUT_EVENT_H
-#define SPECTRE_INPUT_EVENT_H
-
-#include <string>
-#include <vector>
-#include <Spectre/Input/Mouse.h>
-#include <Spectre/Input/Keyboard.h>
-
-namespace sp {
-
-typedef struct InputEvent
-{
-	enum Type
-	{
-		None,
-		Key,
-		MouseButton,
-		MousePosition
-	};
-
-	struct KeyEvent {
-		Keyboard::Key	code;
-		bool			pressed; /* true if pressed, false if released. */
-
-		std::string	getKeyName() const; /* Get the key name */
-	};
-
-	struct MouseButtonEvent {
-		Mouse::Button button;
-		bool		  pressed; /* true if pressed, false if released. */
-
-		std::string	  getName() const;
-	};
-
-	struct MouseEvent {
-		unsigned int x;
-		unsigned int y;
-	};
-
-	Type type;
-	union {
-		struct KeyEvent		key;
-		struct MouseEvent	mouse;
-		struct MouseButtonEvent	mouseButton;
-	};
-
-	InputEvent(Type type = None);
-
-} InputEvent;
-
-} // namespace sp
-
-#endif /* SPECTRE_INPUT_EVENT_H */
diff --git a/include/Spectre/Input/InputListener.h b/include/Spectre/Input/InputListener.h
deleted file mode 100644
index c15a7ae..0000000
--- a/include/Spectre/Input/InputListener.h
+++ /dev/null
@@ -1,17 +0,0 @@
-
-#ifndef SPECTRE_INPUT_LISTENER_H
-#define SPECTRE_INPUT_LISTENER_H
-
-#include "InputEvent.h"
-
-namespace sp {
-
-class InputListener
-{
-public :
-	virtual void onInputEvent(const InputEvent& event);
-};
-
-} // namespace sp
-
-#endif /* SPECTRE_INPUT_LISTENER_H */
diff --git a/include/Spectre/Input/InputModule.h b/include/Spectre/Input/InputModule.h
index c3eb2e7..e30a93d 100644
--- a/include/Spectre/Input/InputModule.h
+++ b/include/Spectre/Input/InputModule.h
@@ -5,9 +5,6 @@
 #include <deque>
 #include <vector>
 
-#include "InputListener.h"
-#include "InputEvent.h"
-
 namespace sp {
 
 class Mouse;
@@ -28,12 +25,6 @@ public :
 
 	void addInputDevice(InputDevice *device);
 
-	void registerListener(InputListener* listener);
-
-	void removeListener(InputListener* listener);
-
-	void postInputEvent(const InputEvent& event);
-
 	// NOTE: Update devices here! (for winapi, process keyboard/mouse messages)
 	void update();
 
@@ -48,11 +39,6 @@ protected :
 
 	Keyboard *m_keyboard;
 
-	// Buffered input queue.
-	std::deque<InputEvent> m_buffer;
-
-	std::vector<InputListener*> m_listeners;
-
 	PlatformInput *m_platform;
 };
 
diff --git a/source/Input/InputEvent.cpp b/source/Input/InputEvent.cpp
deleted file mode 100644
index 4bc80c4..0000000
--- a/source/Input/InputEvent.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-
-#include <Spectre/Input/Mouse.h>
-#include <Spectre/Input/Keyboard.h>
-#include <Spectre/Input/InputEvent.h>
-
-namespace sp {
-
-InputEvent::InputEvent(Type type) :
-type	(type)
-{
-}
-
-std::string InputEvent::KeyEvent::getKeyName() const
-{
-	return Keyboard::getKeyName(code);
-}
-
-std::string InputEvent::MouseButtonEvent::getName() const
-{
-	return Mouse::getButtonName(button);
-}
-
-} // namespace sp
diff --git a/source/Input/InputListener.cpp b/source/Input/InputListener.cpp
deleted file mode 100644
index 2310737..0000000
--- a/source/Input/InputListener.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-
-#include <Spectre/Input/InputListener.h>
-
-namespace sp {
-
-void InputListener::onInputEvent(const InputEvent& event)
-{
-}
-
-} // namespace sp
diff --git a/source/Input/InputModule.cpp b/source/Input/InputModule.cpp
index 076d1c0..cde426d 100644
--- a/source/Input/InputModule.cpp
+++ b/source/Input/InputModule.cpp
@@ -2,7 +2,6 @@
 #include <Platform/PlatformInput.h>
 #include <Spectre/Input/Keyboard.h>
 #include <Spectre/Input/Mouse.h>
-#include <Spectre/Input/InputEvent.h>
 #include <Spectre/Input/InputDevice.h>
 #include <Spectre/Input/InputModule.h>
 
@@ -35,16 +34,6 @@ void InputModule::addInputDevice(InputDevice *device)
 	m_devices.push_back(device);
 }
 
-void InputModule::registerListener(InputListener* listener)
-{
-	m_listeners.push_back(listener);
-}
-
-void InputModule::removeListener(InputListener* listener)
-{
-
-}
-
 Mouse* InputModule::getMouse()
 {
 	return m_mouse;
@@ -55,13 +44,6 @@ Keyboard* InputModule::getKeyboard()
 	return m_keyboard;
 }
 
-void InputModule::postInputEvent(const InputEvent& event)
-{
-	if (m_buffer.size() < 128) {
-		m_buffer.push_back(event);
-	}
-}
-
 void InputModule::update()
 {
 	InputDeviceVec::iterator it;
@@ -70,28 +52,6 @@ void InputModule::update()
 	for(it = m_devices.begin(); it != m_devices.end(); it++) {
 		(*it)->update(this);
 	}
-
-	// Dispatch all events to listeners.
-	dispatch();
-}
-
-void InputModule::dispatch()
-{
-	std::deque<InputEvent>::iterator it;
-
-	for(it = m_buffer.begin(); it != m_buffer.end(); it++) {
-
-		const InputEvent& event = *it;
-
-		// Call listeners.
-		std::vector<InputListener*>::iterator it;
-		for(it = m_listeners.begin(); it != m_listeners.end(); it++) {
-
-			(*it)->onInputEvent(event);
-		}
-	}
-
-	m_buffer.clear();
 }
 
 } // namespace sp