## Description 

Removes final references to commands in RPC. Tried to do this the least
invasive way possible so that it's friendlier for a cherry pick.

## Test Plan 

Tests should still pass.