Low: remote: Code review cleanup