Changed Activity Stream logic for new format to store via kafka
Cleaned up existing code