Delete no longer used stuff after rebase