Finally remove hard-coding comment