RemoveButton_Click event refactoring