removed unnecessary secret option
removed deprecated code