Rebase and more cleanup