further removal of rawdata wpf