remove deprecated fields