More cleanup commits