removed unused events, re-organized events