Bundle cleanup WIP.