6438 add remove button to location