Find delete controls more robustly