Cleaned up some files from common_tools.