a little more cleaning for localization