[#858] removed if 0'd code