More misc cleanup