Removed more dead types