Separate working sets for top-level components
Remove unused dependencies