removed some fields