verify More cleanup