Remove use of queue from remote.c