[CHORE] Misc cleanup.