Fixed issue due to new API changes.
- Updated to common bootstrap mechanism.
- Removed redundant mechanisms, partially now part of API/RI.