ios 8 + cleanup