Removed some dependencies from FeatureWithAssets