Remove link to model elements from handlers (replace on messaging with
event broker)