Pretty much everything from this class down are changes that either a) remove System.out.println statements or b) Get things to compile and tests to pass against 1.9.7