Cleanups to firehose
Cleanups