rebase spurious commits away