Remove system_command for now