Spring dependency tidy-up, investigating issue #5