WP8 cleanup