cleanup Spring samples for 2.0