More intelligent removal selection