Spring configuration cleanup.