More cleanup and updates