refactored events
using new event system, removed old one