Removed fields that are not necessary for the demo