Various cleanup across the board