updated removeEvent/removeModule