Remove dead code