re #856 - Only remove empty categories
Merge branch 'feature/856-categories' into staging