Minor cleanup and removal of unused code
Unify event emitters