issue #1859:remove unneeded code