GDS-1326: code cleanup.