Revert "Some cleanup including a fix for double-pinging, it seems."

This reverts commit ffe39b181d8b4ac30105f6ae9a3501a2cf38ebc5.
iOS 7 broke everything. I pulled every file.

On the next commit, I'll try to add in to this repository every file of
refactored version.