Remove Dependency Resolver
Add support project
Fix remove