More cleanup after refactoring.