diff --git a/Makefile b/Makefile
index 65ac6f4..4907163 100644
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,7 @@ INC_FLAGS := $(addprefix -I,$(INC_DIRS))
 #  object file is also recompiled if only a header is changed.
 # -MP: generate a dummy target for every header file (according to the  docs it
 #  prevents some errors when removing header files)
-CFLAGS ?= -MMD -MP -Wall -Wextra
+CFLAGS ?= -MMD -MP -Wall -Werror -Wextra
 CFLAGS += $(INC_FLAGS)
 
 .PHONY: all
@@ -48,10 +48,6 @@ $(BUILD_DIR)/$(SRC_DIR)/%.c.o: $(SRC_DIR)/%.c
 test: build-test
 	@ $(foreach bin,$(BINS_TEST),./$(bin);)
 
-test-mem: build-test
-	@ $(foreach bin,$(BINS_TEST),valgrind --tool=memcheck --error-exitcode=1 \
-		--track-origins=yes --leak-check=full ./$(bin);)
-
 .PHONY: build-test
 build-test: $(BINS_TEST)
 
diff --git a/include/vieter_tree.h b/include/vieter_tree.h
index be381e5..7dda9e1 100644
--- a/include/vieter_tree.h
+++ b/include/vieter_tree.h
@@ -2,29 +2,14 @@
 #define VIETER_TREE
 
 #include <stdint.h>
-#include <stdlib.h>
 
 typedef struct vieter_tree vieter_tree;
 
 typedef enum vieter_tree_error {
-  vieter_tree_ok = 0,
-  vieter_tree_already_present = 1,
-  vieter_tree_not_present = 2
+    vieter_tree_ok = 0,
+    vieter_tree_already_present = 1
 } vieter_tree_error;
 
-vieter_tree *vieter_tree_init();
-
-void vieter_tree_free(vieter_tree *tree);
-
-vieter_tree_error vieter_tree_insert(vieter_tree *tree, uint64_t key,
-                                     void *data);
-
-vieter_tree_error vieter_tree_search(void **out, vieter_tree *tree,
-                                     uint64_t key);
-
-vieter_tree_error vieter_tree_remove(void **out, vieter_tree *tree,
-                                     uint64_t key);
-
-uint64_t vieter_tree_size(vieter_tree *tree);
+vieter_tree_error vieter_tree_insert(uint64_t key, void *data);
 
 #endif
diff --git a/src/tree/node.c b/src/tree/node.c
deleted file mode 100644
index a154819..0000000
--- a/src/tree/node.c
+++ /dev/null
@@ -1,103 +0,0 @@
-#include "node.h"
-
-vieter_tree_node *vieter_tree_node_init() {
-  return calloc(1, sizeof(vieter_tree_node));
-}
-
-vieter_tree_error vieter_tree_node_insert(vieter_tree_node *node, uint64_t key,
-                                          void *data) {
-  vieter_tree_node *parent = node;
-
-  while (node != NULL) {
-    if (node->key == key) {
-      return vieter_tree_already_present;
-    }
-
-    parent = node;
-
-    if (key < parent->key) {
-      node = parent->left;
-    } else {
-      node = parent->right;
-    }
-  }
-
-  vieter_tree_node *new_node = vieter_tree_node_init();
-  new_node->key = key;
-  new_node->data = data;
-  new_node->parent = parent;
-
-  if (key < parent->key) {
-    parent->left = new_node;
-  } else {
-    parent->right = new_node;
-  }
-
-  return vieter_tree_ok;
-}
-
-vieter_tree_error vieter_tree_node_search_node(vieter_tree_node **out, vieter_tree_node *node, uint64_t key) {
-  while (node != NULL) {
-    if (node->key == key) {
-      *out = node;
-
-      return vieter_tree_ok;
-    }
-
-    if (key < node->key) {
-      node = node->left;
-    } else {
-      node = node->right;
-    }
-  }
-
-  return vieter_tree_not_present;
-}
-
-vieter_tree_error vieter_tree_node_search(void **out, vieter_tree_node *node,
-                                          uint64_t key) {
-    vieter_tree_node *target;
-    vieter_tree_error res = vieter_tree_node_search_node(&target, node, key);
-
-    if (res != vieter_tree_ok) {
-        return res;
-    }
-
-    *out = target->data;
-
-    return vieter_tree_ok;
-}
-
-vieter_tree_node *vieter_tree_node_successor(vieter_tree_node *node) {
-    if (node->left != NULL ^ node->right != NULL) {
-        return node->left != NULL ? node-> left : node->right;
-    }
-
-    node = node->right;
-
-    while (node->left != NULL) {
-        node = node->left;
-    }
-
-    return node;
-}
-
-void vieter_tree_node_replace(vieter_tree_node *to_replace, vieter_tree_node *replacement) {
-
-}
-
-vieter_tree_error vieter_tree_node_remove(void **out, vieter_tree_node *node,
-                                          uint64_t key) {
-    vieter_tree_node *target;
-    vieter_tree_error res = vieter_tree_node_search_node(&target, node, key);
-
-    if (res != vieter_tree_ok) {
-        return res;
-    }
-
-    *out = target->data;
-
-    if (target->left == NULL && target->right == NULL) {
-
-    }
-}
diff --git a/src/tree/node.h b/src/tree/node.h
index b89d0c5..10143ca 100644
--- a/src/tree/node.h
+++ b/src/tree/node.h
@@ -1,28 +1,13 @@
-#ifndef VIETER_TREE_NODE
-#define VIETER_TREE_NODE
+#ifndef VIETER_BALANCED_TREE_NODE
+#define VIETER_BALANCED_TREE_NODE
 
-#include "vieter_tree.h"
 #include <stdint.h>
 
 typedef struct vieter_tree_node {
     uint64_t key;
     void *data;
-    struct vieter_tree_node *parent;
     struct vieter_tree_node *left;
     struct vieter_tree_node *right;
 } vieter_tree_node;
 
-vieter_tree_node *vieter_tree_node_init();
-
-vieter_tree_error vieter_tree_node_insert(vieter_tree_node *node, uint64_t key, void *data);
-
-vieter_tree_error vieter_tree_node_search_node(vieter_tree_node **out, vieter_tree_node *node, uint64_t key);
-vieter_tree_error vieter_tree_node_search(void **out, vieter_tree_node *node, uint64_t key);
-
-vieter_tree_error vieter_tree_node_remove(void **out, vieter_tree_node *node, uint64_t key);
-
-vieter_tree_node *vieter_tree_node_successor(vieter_tree_node *node);
-
-void vieter_tree_node_replace(vieter_tree_node *to_replace, vieter_tree_node *replacement);
-
 #endif
diff --git a/src/tree/tree.c b/src/tree/tree.c
index 725fcda..4a10d5a 100644
--- a/src/tree/tree.c
+++ b/src/tree/tree.c
@@ -1,59 +1,6 @@
-#include "node.h"
 #include "vieter_tree.h"
+#include "node.h"
 
 struct vieter_tree {
-  uint64_t size;
-  vieter_tree_node *root;
+    uint64_t size;
 };
-
-vieter_tree *vieter_tree_init() { return calloc(1, sizeof(vieter_tree)); }
-
-uint64_t vieter_tree_size(vieter_tree *tree) { return tree->size; }
-
-vieter_tree_error vieter_tree_insert(vieter_tree *tree, uint64_t key,
-                                     void *data) {
-  if (tree->size == 0) {
-    tree->root = vieter_tree_node_init();
-    tree->root->key = key;
-    tree->root->data = data;
-    tree->size = 1;
-
-    return vieter_tree_ok;
-  }
-
-  vieter_tree_error res = vieter_tree_node_insert(tree->root, key, data);
-
-  if (res != vieter_tree_ok) {
-    return res;
-  }
-
-  tree->size++;
-
-  return vieter_tree_ok;
-}
-
-vieter_tree_error vieter_tree_search(void **out, vieter_tree *tree,
-                                     uint64_t key) {
-  if (tree->size == 0) {
-    return vieter_tree_not_present;
-  }
-
-  return vieter_tree_node_search(out, tree->root, key);
-}
-
-vieter_tree_error vieter_tree_remove(void **out, vieter_tree *tree,
-                                     uint64_t key) {
-  if (tree->size == 0) {
-    return vieter_tree_not_present;
-  }
-
-  vieter_tree_error res = vieter_tree_node_remove(out, tree->root, key);
-
-  if (res != vieter_tree_ok) {
-    return res;
-  }
-
-  tree->size--;
-
-  return vieter_tree_ok;
-}
diff --git a/test/tree/test_binary_tree.c b/test/tree/test_binary_tree.c
deleted file mode 100644
index e9858ff..0000000
--- a/test/tree/test_binary_tree.c
+++ /dev/null
@@ -1,34 +0,0 @@
-#include "acutest.h"
-#include "vieter_tree.h"
-
-#define TEST_SIZE(tree, size) \
-    TEST_CHECK(vieter_tree_size(tree) == size); \
-    TEST_MSG("Size: %zu", vieter_tree_size(tree))
-
-void test_init() {
-    vieter_tree *tree = vieter_tree_init();
-    TEST_CHECK(tree != NULL);
-    TEST_SIZE(tree, 0);
-    /* vieter_tree_free(tree); */
-}
-
-void test_insert() {
-    vieter_tree *tree = vieter_tree_init();
-
-    for (uint64_t i = 0; i < 25; i++) {
-        TEST_CHECK(vieter_tree_insert(tree, i, NULL) == vieter_tree_ok);
-    }
-
-    void *out;
-
-    for (uint64_t i = 0; i < 25; i++) {
-        TEST_CHECK(vieter_tree_insert(tree, i, NULL) == vieter_tree_already_present);
-        TEST_CHECK(vieter_tree_search(&out, tree, i) == vieter_tree_ok);
-    }
-}
-
-TEST_LIST = {
-    {"test_init", test_init},
-    {"test_insert", test_insert},
-    {NULL, NULL}
-};