hammerhead: Rebase cleanup