JBIDE-14979 cleanup to minimize the number of classes and changs required in such bundles