When pubs reopen indoors on 17th May, perhaps there should be a trial, whereby some pubs have no social distancing and masks, just to see whether this increases the risk of transmission.
I don't think there would be any shortage of volunteers willing to take part in such a trial, me included
Any measures that do remain in place after June 21st must have a definite end date, or objective criteria that can reasonably be met in the next few months before the restriction is removed. (eg, no more masks in the pub after all adults have been offered a first dose of the vaccine - at the end of July)
What we don't want is an open ended law that says, for example, masks must be worn on public transport, and there is no specified end date or criteria that needs to be met before the law is abolished.