block: remove duplicate or unused barrier/discard error paths