Manifest clean-up.
Fixed providers dependencies.