Cleanup unused modules, bundle in the event_binder module