WorkspaceResolver now handles all dependency resolving
Cleanup dependencies properly