Remove remnants of rebase.