remove all -e options from grep use for consistency