Removed some dead code
More dead code removal
Even more dead code removal