Removed more dead code
Removed yet more dead code