cleanup
tests fixed
method removed in JDK8
diagnostics