removed unused classes, added event provider (mock)