Event handler removed from data model
Old code removed