remove dead code for WEB-8859 +review WEBCR-250