Removing static string constant definitions