Remove stale code