Cleaer after rebase