Stop requiring safe_shell