Remove changes related to Tanner's grep branch