Remove conditionals based on #if defined(i386) which wrapped code which was