Cleanup bundle & component dependencies
Merge pull request #1399 from stloyd/bugfix/component_deps

Cleanup bundle & component dependencies