Labels & Clean-up

Added labels to the graph (poorly, going to change) and cleaned up some
code.
removed unused files