Cleaned up the iPhone field client.
Remove some of the unbends.