spring configuration cleanup