Remove references to WP8