diff --git a/Software/PC_Application/Traces/tracetouchstoneexport.cpp b/Software/PC_Application/Traces/tracetouchstoneexport.cpp
index f114ff1..70241c1 100644
--- a/Software/PC_Application/Traces/tracetouchstoneexport.cpp
+++ b/Software/PC_Application/Traces/tracetouchstoneexport.cpp
@@ -1,5 +1,5 @@
 #include "tracetouchstoneexport.h"
-#include "ui_traceexportdialog.h"
+#include "ui_tracetouchstoneexport.h"
 #include <QDebug>
 #include <QFileDialog>
 #include "touchstone.h"
diff --git a/Software/PC_Application/Traces/tracexyplot.cpp b/Software/PC_Application/Traces/tracexyplot.cpp
index 647814a..0304bc1 100644
--- a/Software/PC_Application/Traces/tracexyplot.cpp
+++ b/Software/PC_Application/Traces/tracexyplot.cpp
@@ -785,18 +785,6 @@ QPointF TraceXYPlot::traceToCoordinate(Trace *t, unsigned int sample, TraceXYPlo
     return ret;
 }
 
-//QPoint TraceXYPlot::dataToPixel(Trace::Data d)
-//{
-//    if(d.x < XAxis.rangeMin || d.x > XAxis.rangeMax) {
-//        return QPoint();
-//    }
-//    auto y = traceToCoordinate(d.y, YAxis[0].type);
-//    QPoint p;
-//    p.setX(Util::Scale<double>(d.x, XAxis.rangeMin, XAxis.rangeMax, plotAreaLeft, plotAreaLeft + plotAreaWidth));
-//    p.setY(Util::Scale<double>(y, YAxis[0].rangeMin, YAxis[0].rangeMax, plotAreaBottom, 0));
-//    return p;
-//}
-
 QPoint TraceXYPlot::plotValueToPixel(QPointF plotValue, int Yaxis)
 {
     QPoint p;
@@ -815,11 +803,6 @@ QPointF TraceXYPlot::pixelToPlotValue(QPoint pixel, int Yaxis)
 
 QPoint TraceXYPlot::markerToPixel(TraceMarker *m)
 {
-    QPoint ret = QPoint();
-//    if(m->isTimeDomain() != (XAxis.type != XAxisType::Frequency)) {
-//        // invalid domain
-//        return ret;
-//    }
     auto t = m->getTrace();
     QPointF plotPoint = traceToCoordinate(t, t->index(m->getPosition()), YAxis[0].type);
     return plotValueToPixel(plotPoint, 0);
diff --git a/Software/PC_Application/Traces/tracexyplot.h b/Software/PC_Application/Traces/tracexyplot.h
index fe2bb62..134e92d 100644
--- a/Software/PC_Application/Traces/tracexyplot.h
+++ b/Software/PC_Application/Traces/tracexyplot.h
@@ -65,7 +65,6 @@ private:
     bool supported(Trace *t, YAxisType type);
     void removeUnsupportedTraces();
     QPointF traceToCoordinate(Trace *t, unsigned int sample, YAxisType type);
-//    QPoint dataToPixel(Trace::Data d);
     QPoint plotValueToPixel(QPointF plotValue, int Yaxis);
     QPointF pixelToPlotValue(QPoint pixel, int YAxis);
     QPoint markerToPixel(TraceMarker *m) override;