Removed more TypeUniverse stuff