Cleanup, got rid of "translate_cmd"