removing use of UUID also in tests and in javadoc