Remove unnecessary use of grep
Version 6