Removed unnecessary OnPropertyChanged events