Remove cleanup from remote.c