Core: Removed _addEvent() and cleaned up
Core: Small cleanups