Removing unused strings
Taking care of configurations changes