Remove TODO, safety call event