builtin-remote: refactor duplicated cleanup code