Remove sm and em dependency from events