diff --git a/src/window/Events.cpp b/src/window/Events.cpp
index fbc3c31cc..b24e8ea0e 100644
--- a/src/window/Events.cpp
+++ b/src/window/Events.cpp
@@ -4,11 +4,8 @@
 #include <GLFW/glfw3.h>
 #include <string.h>
 
-const short KEYS_BUFFER_SIZE = 1032;
-const short _MOUSE_KEYS_OFFSET = 1024;
-
-bool* Events::_keys;
-uint* Events::_frames;
+bool Events::_keys[KEYS_BUFFER_SIZE] = {};
+uint Events::_frames[KEYS_BUFFER_SIZE] = {};
 uint Events::_current = 0;
 float Events::deltaX = 0.0f;
 float Events::deltaY = 0.0f;
@@ -21,21 +18,6 @@ std::vector<uint> Events::codepoints;
 std::vector<int> Events::pressedKeys;
 std::unordered_map<std::string, Binding> Events::bindings;
 
-int Events::initialize(){
-	_keys = new bool[KEYS_BUFFER_SIZE];
-	_frames = new uint[KEYS_BUFFER_SIZE];
-
-	memset(_keys, false, KEYS_BUFFER_SIZE*sizeof(bool));
-	memset(_frames, 0, KEYS_BUFFER_SIZE*sizeof(uint));
-
-	return 0;
-}
-
-void Events::finalize(){
-	delete[] _keys;
-	delete[] _frames;
-}
-
 // Returns bool repr. of key state
 bool Events::pressed(int keycode){
 	if (keycode < 0 || keycode >= KEYS_BUFFER_SIZE){
diff --git a/src/window/Events.h b/src/window/Events.h
index f9eea2c88..ff813ce6b 100644
--- a/src/window/Events.h
+++ b/src/window/Events.h
@@ -10,13 +10,13 @@
 
 typedef unsigned int uint;
 
-extern const short KEYS_BUFFER_SIZE;
-extern const short _MOUSE_KEYS_OFFSET;
+const short KEYS_BUFFER_SIZE = 1032;
+const short _MOUSE_KEYS_OFFSET = 1024;
 
 class Events {
 public:
-	static bool* _keys;
-	static uint* _frames;
+	static bool _keys[KEYS_BUFFER_SIZE];
+	static uint _frames[KEYS_BUFFER_SIZE];
 	static uint _current;
 	static float deltaX;
 	static float deltaY;
@@ -29,8 +29,6 @@ class Events {
 	static std::vector<int> pressedKeys;
 	static std::unordered_map<std::string, Binding> bindings;
 
-	static int initialize();
-	static void finalize();
 	static void pollEvents();
 
 	static bool pressed(int keycode);
diff --git a/src/window/Window.cpp b/src/window/Window.cpp
index ebfab025e..7cb1477e6 100644
--- a/src/window/Window.cpp
+++ b/src/window/Window.cpp
@@ -163,7 +163,6 @@ int Window::initialize(DisplaySettings& settings){
 	glEnable(GL_BLEND);
 	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 
-	Events::initialize();
 	glfwSetKeyCallback(window, key_callback);
 	glfwSetMouseButtonCallback(window, mouse_button_callback);
 	glfwSetCursorPosCallback(window, cursor_position_callback);
@@ -255,7 +254,6 @@ void Window::popScissor() {
 }
 
 void Window::terminate(){
-	Events::finalize();
 	glfwTerminate();
 }