Java port update & cleanup