Single commit to both remove original WPF work and commit WPA work.