B-58092 deduping remote/command classes