a few more leftovers from the refactoring