Remove even more unused code.