More cleanup done