remove workaround for deprecated code