Remove dead logic