Pruning

Removed unused code to prep for testing specs.