- * This is a functional interface and can be used as the assignment target for a
- * lambda expression or method reference.
- *
- * @param
- * This is a functional interface and can be used as the assignment target for a
- * lambda expression or method reference.
- *
- * @param
- * This is a functional interface and can be used as the assignment target for a
- * lambda expression or method reference.
- *
- * @param
- * Bundles wishing to use this package must list the package in the
- * Import-Package header of the bundle's manifest.
- *
- * Example import for consumers using the API in this package:
- *
- * {@code Import-Package: org.osgi.util.function; version="[1.1,2.0)"}
- *
- * Example import for providers implementing the API in this package:
- *
- * {@code Import-Package: org.osgi.util.function; version="[1.1,1.2)"}
- *
- * @author $Id$
- */
-
-@Version("1.1")
-package org.osgi.util.function;
-
-import org.osgi.annotation.versioning.Version;
-
diff --git a/bundles/org.eclipse.osgi.util/src/org/osgi/util/measurement/Measurement.java b/bundles/org.eclipse.osgi.util/src/org/osgi/util/measurement/Measurement.java
deleted file mode 100644
index 4a8cf6629..000000000
--- a/bundles/org.eclipse.osgi.util/src/org/osgi/util/measurement/Measurement.java
+++ /dev/null
@@ -1,480 +0,0 @@
-/*
- * Copyright (c) OSGi Alliance (2002, 2016). All Rights Reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.osgi.util.measurement;
-
-/**
- * Represents a value with an error, a unit and a time-stamp.
- *
- *
- * A {@code Measurement} object is used for maintaining the tuple of value,
- * error, unit and time-stamp. The value and error are represented as doubles
- * and the time is measured in milliseconds since midnight, January 1, 1970 UTC.
- *
- *
- * Mathematic methods are provided that correctly calculate taking the error
- * into account. A runtime error will occur when two measurements are used in an
- * incompatible way. E.g., when a speed (m/s) is added to a distance (m). The
- * measurement class will correctly track changes in unit during multiplication
- * and division, always coercing the result to the most simple form. See
- * {@link Unit} for more information on the supported units.
- *
- *
- * Errors in the measurement class are absolute errors. Measurement errors
- * should use the P95 rule. Actual values must fall in the range value +/- error
- * 95% or more of the time.
- *
- *
- * A {@code Measurement} object is immutable in order to be easily shared.
- *
- *
- * Note: This class has a natural ordering that is inconsistent with equals. See
- * {@link #compareTo(Object)}.
- *
- * @Immutable
- * @author $Id$
- */
-public class Measurement implements Comparable