some misc cleanup