Clean-up after latest refactoring