More cleanup for WP8 template