Cmd: remove more C code