Use module:fire_event where possible, cleanup