Removed some fields