Clean up unused methods
Enable scatterPlotTest