Remove hardcoded strings