CategoryBuilder.RemoveEmptyCategories doesn't clear CollectionChanged eventhandler
Initially assigned eventhandler
Small reorganization