Deprecated fields removed