As above. Should the empty ones just be removed?