Merge "Remove "listener_id" from functions where it's not in use"