Remove unnecessary greps.
Cleanup syntax.