Remove yet more unused code