More cleanup for #7