fix event deletion and service decoupling