Delete more unused code