Removed dependency on WPF in prep for portability