add some names in for event sinks
remove unused function
remove unused method