Remove unused method
Clean up and exercise the ErrorSet class
General clean up and removal of code smells