Delete more and more code