#40 @andreweskeclarke @rdsubhas Optimize deprecated_fields function