Narrowed the scope of selection for delete button selection.

Fixed TIM-650
Gotcha. I hadn't realized removeButtonClass was a variable.