Clean up and rebase deps.