Addresses issue #913. Also remove some commented out code and toxic debugging code that uses System.out/err.println.