Remove stale code from diffusion engine