Various cleanup across the board
Merge conflicts resolved