[Cleanup] Misc cleanup