[Code Review] Remove unused events