Catalog edit and remove merge to one page;
Remove catalog update useless code;