Removed unused variables.
First working version of the new graph.