nicki: remove the uneeded and change left over part from huashan to nicki