misc cleanup-2