Fix: Deprecated and no more used fields should not appear to user.