bundle update
Cleaning up after rebase