Remove PubSub for now as causing some js errors when using multuple subscriptions to events
Remove dev comments
Fix jshint warnings