More cleanup of localization