Hide: Misc cleanup