--- dyld/dyld-44.17/src/dyld.cpp
+++ dyld/dyld-44.2/src/dyld.cpp
@@ -241,6 +241,10 @@
 
 void removeImage(ImageLoader* image)
 {
+	// flush find-by-address cache
+	if ( sLastImageByAddressCache == image )
+		sLastImageByAddressCache = NULL;
+
 	// if in termination list, pull it out and run terminator
 	for (std::vector<ImageLoader*>::iterator it=sImageFilesNeedingTermination.begin(); it != sImageFilesNeedingTermination.end(); it++) {
 		if ( *it == image ) {
@@ -273,10 +277,6 @@
 		}
 	}
 	
-	// flush find-by-address cache
-	if ( sLastImageByAddressCache == image )
-		sLastImageByAddressCache = NULL;
-
 	// if in announcement list, pull it out 
 	for (std::vector<ImageLoader*>::iterator it=sImagesToNotifyAboutOtherImages.begin(); it != sImagesToNotifyAboutOtherImages.end(); it++) {
 		if ( *it == image ) {
@@ -818,20 +818,6 @@
 #if FIND_STATS	
 		++cacheNotMacho;
 #endif
-	return NULL;
-}
-
-ImageLoader* findImageContainingAddressThreadSafe(const void* addr)
-{
-	// do exhastive search 
-	// todo: consider maintaining a list sorted by address ranges and do a binary search on that
-	const unsigned int imageCount = sAllImages.size();
-	for(unsigned int i=0; i < imageCount; ++i) {
-		ImageLoader* anImage = sAllImages[i];
-		if ( anImage->containsAddress(addr) ) {
-			return anImage;
-		}
-	}
 	return NULL;
 }
 
@@ -1235,18 +1221,8 @@
 	
 	// try other file formats...
 	
-	
-	// throw error about what was found
-	switch (*(uint32_t*)firstPage) {
-		case MH_MAGIC:
-		case MH_CIGAM:
-		case MH_MAGIC_64:
-		case MH_CIGAM_64:
-			throw "mach-o, but wrong architecture";
-		default:
-		throwf("unknown file type, first eight bytes: 0x%02X 0x%02X 0x%02X 0x%02X 0x%02X 0x%02X 0x%02X 0x%02X", 
-			firstPage[0], firstPage[1], firstPage[2], firstPage[3], firstPage[4], firstPage[5], firstPage[6],firstPage[7]);
-	}
+	throwf("unknown file type, first eight bytes: 0x%02X 0x%02X 0x%02X 0x%02X 0x%02X 0x%02X 0x%02X 0x%02X", 
+		firstPage[0], firstPage[1], firstPage[2], firstPage[3], firstPage[4], firstPage[5], firstPage[6],firstPage[7]);
 }
 
 
@@ -1632,17 +1608,8 @@
 	
 	// try other file formats...
 	
-	// throw error about what was found
-	switch (*(uint32_t*)mem) {
-		case MH_MAGIC:
-		case MH_CIGAM:
-		case MH_MAGIC_64:
-		case MH_CIGAM_64:
-			throw "mach-o, but wrong architecture";
-		default:
-		throwf("unknown file type, first eight bytes: 0x%02X 0x%02X 0x%02X 0x%02X 0x%02X 0x%02X 0x%02X 0x%02X", 
-			mem[0], mem[1], mem[2], mem[3], mem[4], mem[5], mem[6],mem[7]);
-	}
+	throwf("unknown file type, first eight bytes: 0x%02X 0x%02X 0x%02X 0x%02X 0x%02X 0x%02X 0x%02X 0x%02X", 
+		mem[0], mem[1], mem[2], mem[3], mem[4], mem[5], mem[6],mem[7]);
 }
 
 
@@ -1714,17 +1681,8 @@
 #endif
 	// lookup and bind lazy pointer and get target address
 	try {
-		ImageLoader* target;
-	#if __i386__
-		// fast stubs pass NULL for mh and image is instead found via the location of stub (aka lazyPointer)
-		if ( mh == NULL )
-			target = dyld::findImageContainingAddressThreadSafe(lazyPointer);
-		else
-			target = dyld::findImageByMachHeader(mh);
-	#else
 		// note, target should always be mach-o, because only mach-o lazy handler wired up to this
-		target = dyld::findImageByMachHeader(mh);
-	#endif
+		ImageLoader* target = dyld::findImageByMachHeader(mh);
 		if ( target == NULL )
 			throw "image not found for lazy pointer";
 		result = target->doBindLazySymbol(lazyPointer, gLinkContext);
@@ -1961,17 +1919,6 @@
 
 
 //
-// _pthread_keys is partitioned in a lower part that dyld will use; libSystem
-// will use the upper part.  We set __pthread_tsd_first to 1 as the start of
-// the lower part.  Libc will take #1 and c++ exceptions will take #2.  There
-// is one free key=3 left.
-//
-extern "C" {
-	extern int __pthread_tsd_first;
-}
- 
-
-//
 // Entry point for dyld.  The kernel loads dyld and jumps to __dyld_start which
 // sets up some registers and call this function.
 //
@@ -1980,16 +1927,8 @@
 uintptr_t
 _main(const struct mach_header* mainExecutableMH, int argc, const char* argv[], const char* envp[], const char* apple[])
 {	
-	// set pthread keys to dyld range
-	__pthread_tsd_first = 1;
-	
-	bool isEmulated = checkEmulation();
 	// Pickup the pointer to the exec path.
 	sExecPath = apple[0];
-	if (isEmulated) {
-		// under Rosetta 
-		sExecPath = strdup(apple[0] + strlen(apple[0]) + 1);
-	}
 	if ( sExecPath[0] != '/' ) {
 		// have relative path, use cwd to make absolute
 		char cwdbuff[MAXPATHLEN];
@@ -2004,6 +1943,7 @@
 	}
 	uintptr_t result = 0;
 	sMainExecutableMachHeader = mainExecutableMH;
+	bool isEmulated = checkEmulation();
 	checkEnvironmentVariables(envp, isEmulated);
 	if ( sEnv.DYLD_PRINT_OPTS ) 
 		printOptions(argv);