Removed 2D-plotting for now