fix trivial deleted line
further cleaning of Cluster and EventFilter