Added params check, removed deprecated code (issue #3479)