[WIP] iOS 6 purge and related fixes