Remove beforeChange event, update strings

Loose ends from #5151 code review