Icky (but correct) handling of matches
Remove gunk