Field cleanup across API
updated live
Updated live