cleanup from earlier refactoring