Zori links view update + remove useless code