More progress on removing hardcoded string "Normal"