Removing more dead code.