[#8455] remove @with_setup
8 files changed