Cleaning up some things in tools.