diff --git a/src/dev/dhustigschultz/BP_SC_SymmetricSpiral_All/JSONQuadCPGGeneralControl.h b/src/dev/dhustigschultz/BP_SC_SymmetricSpiral_All/JSONQuadCPGGeneralControl.h
deleted file mode 100644
index 2d5986c99..000000000
--- a/src/dev/dhustigschultz/BP_SC_SymmetricSpiral_All/JSONQuadCPGGeneralControl.h
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
- * Copyright © 2012, United States Government, as represented by the
- * Administrator of the National Aeronautics and Space Administration.
- * All rights reserved.
- * 
- * The NASA Tensegrity Robotics Toolkit (NTRT) v1 platform is licensed
- * under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
- * either express or implied. See the License for the specific language
- * governing permissions and limitations under the License.
-*/
-
-#ifndef JSON_QUAD_CPG_GENERAL_CONTROL_H
-#define JSON_QUAD_CPG_GENERAL_CONTROL_H
-
-/**
- * @file JSONCPGGeneralControl.h
- * @brief An adaptation of JSONCPGControl that utilizes JSON for parameters
- * @brief Modified for use with quadrupeds, so that certain metrics can be gathered. Modified to use 3D multi_array, 
- * since can't override 4D in the original base class. 
- * @author Brian Mirletz, Dawn Hustig-Schultz
- * @date Jan 2015
- * @version 1.1.0
- * $Id$
- */
-
-#include "dev/dhustigschultz/BigPuppy_SpineOnly_Stats/BaseQuadModelLearning.h"
-
-#include <vector>
-#include "boost/multi_array.hpp"
-
-#include "core/tgSubject.h"
-#include "core/tgObserver.h"
-#include "sensors/tgDataObserver.h"
-
-#include <json/value.h>
-
-// Forward Declarations
-class tgImpedanceController;
-class tgCPGGeneralActuatorControl;
-class CPGEquations;
-class tgCPGLogger;
-class BaseSpineModelLearning;
-class BaseSpineCPGControl;
-
-typedef boost::multi_array<double, 2> array_2D;
-typedef boost::multi_array<double, 4> array_4D;
-
-/**
- * JSONCPGControl learns the parameters for a CPG system on a
- * spine like tensegrity structure specified as a BaseQuadModelLearning. Parameters are generated by
- * AnnealEvolution and used in the CPGEquations family of classes.
- * tgImpedanceController controllers are used for the detailed muscle control.
- * Due to the number of parameters, the learned parameters are split
- * into one config file for the nodes and another for the CPG's "edges"
- */
-class JSONQuadCPGGeneralControl : public tgObserver<BaseQuadModelLearning>, public tgSubject <JSONQuadCPGGeneralControl>
-{
-public:
-
-struct Config
-    {
-    public:
-        /**
-         * The only constructor. 
-         */
-        Config( int ss,
-        int tm,
-        int om,
-        int param,
-        int segnum = 6,
-        double ct = 0.1,
-        double la = 0,
-        double ha = 30,
-        double lp = -1 * M_PI,
-        double hp = M_PI,
-        double kt = 0.0,
-        double kp = 1000.0,
-        double kv = 100.0,
-        bool def = true,
-        double cl = 10.0,
-        double lf = 0.0,
-        double hf = 30.0);
-      
-		// Learning Parameters
-		const int segmentSpan; // 3 possible muscles touching two rigid bodies
-		const int theirMuscles; // 8 muscles in a segment 
-		const int ourMuscles; // same as above
-		const int params; // Number of parameters per edge
-		const int segmentNumber;
-        
-        // CPG control frequency
-        const double controlTime;
-        
-        // Limit Params
-        const double lowAmp;
-        const double highAmp;
-        const double lowFreq;
-        const double highFreq;
-        const double lowPhase;
-        const double highPhase;
-        
-		// Parameters for Impedance Controllers
-		const double tension;
-		const double kPosition;
-		const double kVelocity;
-		const bool useDefault;
-        const double controlLength;    
-    };
-
-    JSONQuadCPGGeneralControl(JSONQuadCPGGeneralControl::Config config,	
-							std::string args,
-							std::string resourcePath = "");
-    
-    virtual ~JSONQuadCPGGeneralControl();
-    
-    virtual void onStep(BaseQuadModelLearning& subject, double dt);
-    
-    virtual void onSetup(BaseQuadModelLearning& subject);
-    
-    virtual void onTeardown(BaseQuadModelLearning& subject);
-
-	const double getCPGValue(std::size_t i) const;
-	
-	double getScore() const;
-	
-protected:
-    /**
-     * Takes a vector of parameters reported by learning, and then 
-     * converts it into a format used to assign to the CPGEdges
-     * Note that if the CPG edges change, this will need to change
-     */
-    virtual array_4D scaleEdgeActions (Json::Value edgeParam);
-    virtual array_2D scaleNodeActions (Json::Value actions);
-    
-    virtual void setupCPGs(BaseQuadModelLearning& subject, array_2D nodeActions, array_4D edgeActions);
-
-    CPGEquations* m_pCPGSys;
-    
-    std::vector<tgCPGGeneralActuatorControl*> m_allControllers;
-    
-    JSONQuadCPGGeneralControl::Config m_config;
-
-    std::vector<double> initConditions;
-    
-    std::size_t segments;
-    
-    tgDataObserver m_dataObserver;
-    
-    double m_updateTime;
-    double m_totalTime;
-    
-    std::vector<double> scores;
-    std::vector<double> metrics;
-    
-    bool bogus;
-    
-    std::string controlFilename;
-    std::string controlFilePath;
-};
-
-#endif // BASE_SPINE_CPG_CONTROL_H