Removed more dead code