removed averaging code

removed commenting averaging as it is already accounted for.  also
removed old strmatch lines that were commented