misc cleanup.