(maint) Remove dead code