More stripping out arch related code