More cleanup and changes.