Futher iphone cleanup