Bundle configuration clean up

- Cleaned up bundle registration methods.