Use NO_WRAP flag to prevent newlines in filename
Remove unneeded curlies
Delete when user avatar directory path is already a file