remove fragile code