Bug removal