Remove dead code in support