Assorted cleanup across Nimbus

Perform assorted cleanup across Nimbus.