Good point Björn, perhaps would make sense to scrap them now when we have a lot of different mailboxes and instead require putting the FQCN instead?