remove ueseless conditional logic and deprecated code
1 file changed