Polish. Mostly remove refs to specific Spring versions
Generic @Autowire