Clean up
Add user stream message type