Final cleanups to dynamic fields