iOS6 cleanup