Kill more unused code