No longer needed because of previous refactoring