Cleanup JavaUtils and other stuff