Combining event streams for dashboard and getting rid of unused column

This should be moved to a model.