Still cleaning code after rebase; lingering HEAD