More standard cleanup stuff.