respect the scope ;) and cleanup some unnecessary events