Remove comment
Use grep instead of select + match