Remove usage of interface for events