User: Remove dead code