Remove dead optimization