re #856 - Only remove empty categories