Cleaning up some more.