Fix&CleanUp

Fix
1. fix the problem with event like

CleanUp
1. remove unused