Remove logging and unnecessary normalizedName