getting rid of the event subscriber for now
Merge remote-tracking branch 'origin/master'