More cleanup in Level.