Update to 3.980

Code clean-up