Move click event to remove button