Remove unused statement
Add support for ios 8