Cleaned up unused code.
Removed unused and commented out code
  This code was either nonfunctional or buggy. It cam be found in the feature branch 'tests'