Removed some temporary testing/drawing functionality