Cleanup.
Cleanup.
Cleanup iPhone responses.
Merge branch 'develop'