Remove TProtocol2. Will implement some other day in the distant future
Avoid compiler WARNing about non-existent withFilter method

`withFilter' method does not yet exist on scala.collection.GenMap[K,V], using `filter' method instead