Remove stale references