Effort to remove BundleContext dependency