diff --git a/README.md b/README.md
index 043a927..7f33dc6 100755
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ OWA-EPANET
 
 ## INSTALLATION
 
-Instructions for building the OWA-EPANET Toolkit's function library as well as its command line executable from the source files in this repository can be found [here](https://github.com/OpenWaterAnalytics/EPANET/blob/dev/BUILDING.md).
+Instructions for building the OWA-EPANET Toolkit's function library as well as its command line executable from the source files in this repository can be found [here](https://github.com/OpenWaterAnalytics/EPANET/blob/master/BUILDING.md).
 
 ## USAGE
 
diff --git a/src/util/list.c b/src/util/list.c
deleted file mode 100644
index 443fcf2..0000000
--- a/src/util/list.c
+++ /dev/null
@@ -1,246 +0,0 @@
-/*
- ******************************************************************************
- Project:      OWA EPANET
- Version:      2.2
- Module:       util/list.h
- Description:  Generic list
-               https://gist.github.com/pseudomuto/6334796#file-list-c
-               Accessed: April 9, 2019
- Authors:      David Muto, Michael Tryby
- Copyright:    see AUTHORS
- License:      see LICENSE
- Last Updated: 04/09/2019
- ******************************************************************************
-*/
-
-#ifdef _DEBUG
-#define _CRTDBG_MAP_ALLOC
-#include <stdlib.h>
-#include <crtdbg.h>
-#else
-#include <stdlib.h>
-#endif
-
-#include <string.h>
-#include <time.h>
-#include <assert.h>
-
-#include "list.h"
-
-
-typedef struct list_node_s {
-    void *data;
-    int key;
-    struct list_node_s *next;
-} list_node_t;
-
-
-typedef struct list_s {
-    int logicalLength;
-    size_t elementSize;
-    list_node_t *head;
-    list_node_t *tail;
-    freeFunction freeFn;
-} list_t;
-
-
-// local declarations
-int gen_key();
-
-list_t *create_list(size_t elementSize, freeFunction freeFn)
-{
-    list_t *list;
-    list = (list_t *)calloc(1, sizeof(list_t));
-
-    assert(elementSize > 0);
-    list->logicalLength = 0;
-    list->elementSize = elementSize;
-    list->head = list->tail = NULL;
-    list->freeFn = freeFn;
-    return list;
-}
-
-void delete_list(list_t *list)
-{
-    list_node_t *current;
-
-    while(list->head != NULL) {
-        current = list->head;
-        list->head = current->next;
-        delete_node(list, current);
-    }
-    free(list);
-}
-
-int prepend_list(list_t *list, void *element)
-{
-    list_node_t *node = malloc(sizeof(list_node_t));
-    node->data = malloc(list->elementSize);
-    memcpy(node->data, element, list->elementSize);
-
-    node->key = gen_key();
-
-    node->next = list->head;
-    list->head = node;
-
-    // first node?
-    if(!list->tail) {
-        list->tail = list->head;
-    }
-
-    list->logicalLength++;
-
-    return node->key;
-}
-
-int append_list(list_t *list, void *element)
-{
-	list_node_t *node = malloc(sizeof(list_node_t));
-    node->data = malloc(list->elementSize);
-    node->next = NULL;
-
-    node->key = gen_key();
-
-    memcpy(node->data, element, list->elementSize);
-
-    if(list->logicalLength == 0) {
-        list->head = list->tail = node;
-    } else {
-        list->tail->next = node;
-        list->tail = node;
-    }
-
-    list->logicalLength++;
-
-    return node->key;
-}
-
-
-void for_each_list(list_t *list, listIterator iterator)
-{
-    assert(iterator != NULL);
-
-    list_node_t *node = list->head;
-    bool result = true;
-
-	while(node != NULL && result) {
-		result = iterator(node);
-        node = node->next;
-    }
-}
-
-list_node_t *head_list(list_t *list, bool removeFromList)
-// Warning: When node is removed caller is responsible for freeing it.
-{
-    if (list) {
-        list_node_t *node = list->head;
-        if (removeFromList) {
-            // Disconnecting head node
-            list->head = node->next;
-            list->logicalLength--;
-        }
-        return node;
-    }
-    return NULL;
-}
-
-list_node_t *tail_list(list_t *list)
-{
-    assert(list->tail != NULL);
-    return list->tail;
-}
-
-list_node_t *get_nth_list(list_t *list, int index)
-{
-    int n;
-    list_node_t *lnode;
-
-    for (n = 1, lnode = first_list(list); n < index && done_list(lnode); n++, lnode = next_list(lnode));
-    if (n != index)
-        return NULL;
-    else
-        return lnode;
-}
-
-list_node_t *search_list(list_t *list, int key)
-// Naive list search. Will not perform for large lists.
-{
-    list_node_t *lnode = first_list(list);
-
-    while (done_list(lnode)) {
-        if (get_key(lnode) == key)
-            return lnode;
-        lnode = next_list(lnode);
-    }
-    return NULL;
-}
-
-void remove_node(list_t *list, int key)
-{
-    list_node_t *temp;
-    list_node_t *target = search_list(list, key);
-
-    if (target == list->head)
-        delete_node(list, head_list(list, true));
-
-    else if (target == list->tail) {
-        // find next to last node
-        temp = list->head;
-        while (temp != NULL) {
-            if (temp->next == target)
-                break;
-            temp = temp->next;
-        }
-        // detatch tail
-        temp->next = NULL;
-        delete_node(list, list->tail);
-    }
-    else {
-        temp = target->next;
-        list->freeFn(target->data);
-        free(target->data);
-
-        target->data = temp->data;
-        target->next = temp->next;
-
-        free(temp);
-    }
-}
-
-int size_list(list_t *list)
-{
-    return list->logicalLength;
-}
-
-int get_key(list_node_t *lnode)
-{
-    return lnode->key;
-}
-
-void *get_data(list_node_t *lnode)
-{
-    return lnode->data;
-}
-
-list_node_t *get_next(list_node_t *lnode)
-{
-	return lnode->next;
-}
-
-void delete_node(list_t *list, list_node_t *lnode)
-{
-    if (list->freeFn)
-        list->freeFn(lnode->data);
-
-    free(lnode->data);
-    free(lnode);
-}
-
-
-// local functions
-
-int gen_key()
-// Naive key generator. No guarentee of uniqueness
-{
-    return rand();
-}
diff --git a/src/util/list.h b/src/util/list.h
deleted file mode 100644
index 599acde..0000000
--- a/src/util/list.h
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- ******************************************************************************
- Project:      OWA EPANET
- Version:      2.2
- Module:       util/list.h
- Description:  Generic list
-               https://gist.github.com/pseudomuto/6334796#file-list-h
-               Accessed: April 9, 2019
- Authors:      David Muto, Michael Tryby
- Copyright:    see AUTHORS
- License:      see LICENSE
- Last Updated: 04/09/2019
- ******************************************************************************
-*/
-
-#ifndef LIST_H
-#define LIST_H
-
-
-#include <stdbool.h>
-
-
-#if defined(__cplusplus)
-extern "C" {
-#endif
-
-
-// Forward declarations
-typedef struct list_node_s list_node_t;
-typedef struct list_s list_t;
-
-typedef void (*freeFunction) (void *);
-typedef bool (*listIterator) (list_node_t *);
-
-
-/**
-@brief Initializes a linked list to store elements of elementSize and to call
-freeFunction for each element when destroying a list.
-*/
-list_t *create_list(size_t elementSize, freeFunction freeFn);
-
-/**
-@brief Frees dynamically allocated nodes and optionally calls freeFunction
-with each node’s data pointer.
-*/
-void delete_list(list_t *list);
-
-/**
-@brief Adds a node to the head of the list and returns its key.
-*/
-int prepend_list(list_t *list, void *element);
-
-/**
-@brief Adds a node to the tail of the list and returns its key.
-*/
-int append_list(list_t *list, void *element);
-
-/**
-@brief Returns the number of items in the list.
-*/
-int size_list(list_t *list);
-
-
-/**
-@brief Returns pointer to list node's data.
-*/
-void *get_data(list_node_t *lnode);
-
-/**
-@brief Returns list node's key value.
-*/
-int get_key(list_node_t *lnode);
-
-/**
-@brief Returns next list node.
-*/
-list_node_t *get_next(list_node_t *lnode);
-
-/**
-@brief Frees memory associated with a list node.
-*/
-void delete_node(list_t *list,  list_node_t *lnode);
-
-
-/**
-@brief Calls the supplied iterator function with the data element of each
-node (iterates over the list).
-*/
-void for_each_list(list_t *list, listIterator iterator);
-
-/**
-@brief Returns the head of the list (optionally removing it at the same time).
-*/
-list_node_t *head_list(list_t *list, bool removeFromList);
-
-/**
-@brief Returns the tail of the list.
-*/
-list_node_t *tail_list(list_t *list);
-
-/**
-@brief Returns nth node of the list or NULL.
-*/
-list_node_t *get_nth_list(list_t *list, int index);
-
-/**
-@brief Returns the list node with the given key or NULL.
-*/
-list_node_t *search_list(list_t *list, int key);
-
-/**
-@brief Removes the list node with the given key from the list. 
-*/
-void remove_node(list_t *list, int key);
-
-//
-// Iterator first/done/next operations
-// http://www.cs.yale.edu/homes/aspnes/pinewiki/C(2f)Iterators.html
-// Accessed on April 11, 2019
-//
-
-/**
-@brief Returns list head node.
-*/
-static inline list_node_t *first_list(list_t *list) { return head_list(list, false); }
-
-/**
-@brief Returns true if end of list false otherwise.
-*/
-static inline bool done_list(list_node_t *lnode) { return lnode != NULL; }
-
-/**
-@brief Returns next node in the list.
-*/
-static inline list_node_t *next_list(list_node_t *lnode) { return get_next(lnode); }
-
-
-#if defined(__cplusplus)
-}
-#endif
-
-#endif /* LIST_H */