Minor: More cleanup