Spring shortcuts

Spring XML cleanup