Rebase, clear, clean everything !