Remove unnecessary calls to shell_safe