Finally got rid of StateUtils!! Lots of Java 8 usages to clean up that code to begin with. Also cleaned up some toString()s and Javadocs.