Remove dead code
More dead code deletion