We need to finalise if we have a use case, otherwise we can just remove the support before v1 prod. Ref #9
