staticLocalization code clean-up