Removed some more dead code