Cleaning some things up.