removed __IPHONE_3_1 checks