more misc cleanup