more iPhone 4 clean up