Remove unnecessary code from iOS and changes for WP8