More Spring XML cleanup