Added remove buttons for testing