More cleanup done, more needed