Fix: remove the mainloop_trigger that are no longer needed.