Cleaning up more.