nit: we can remove dead code