More cleanup in numbertree