OSGi/catalog improvements

already handled by the caller, remove