No longer need to check for subscriptions when non-pubsub events are concerned
Merge branch 'simplify-api'
v1.5.1