Remove hacks now that I know its INotifyPropertyChanged